aboutsummaryrefslogtreecommitdiffstats
path: root/french/aster
diff options
context:
space:
mode:
authorthierry <thierry@FreeBSD.org>2007-03-26 04:28:07 +0800
committerthierry <thierry@FreeBSD.org>2007-03-26 04:28:07 +0800
commit968e1b7200c68bdc28bdf6bf3e49706010054bd6 (patch)
tree8ff1cf759b157bcacf6bb3d1aa03339c17da8321 /french/aster
parentf6b0ab0c8bdb7955698900f4228ba7beb3fb6bfd (diff)
downloadfreebsd-ports-gnome-968e1b7200c68bdc28bdf6bf3e49706010054bd6.tar.gz
freebsd-ports-gnome-968e1b7200c68bdc28bdf6bf3e49706010054bd6.tar.zst
freebsd-ports-gnome-968e1b7200c68bdc28bdf6bf3e49706010054bd6.zip
Fix my previous commit: -fdefault-integer-8 and -fdefault-real-8 should
not be included in CPPFLAGS when ARCH != i386.
Diffstat (limited to 'french/aster')
-rw-r--r--french/aster/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 70a37543ce95..5e1f51fd1d45 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -66,8 +66,10 @@ PKGMESSIN= pkg-message.in
.if ${ARCH} == "i386"
FLAGARCH= -DP_LINUX -DLINUX
+FFLAGARCH=
.else
-FLAGARCH= -DLINUX64 -fdefault-integer-8 -fdefault-real-8
+FLAGARCH= -DLINUX64
+FFLAGARCH= -fdefault-integer-8 -fdefault-real-8
.endif
.if ${OSVERSION} < 600022
@@ -272,11 +274,11 @@ pre-configure:
${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "EDITOR='${WITH_ED}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'" >> ${WRKSRC}/setup.cfg
- ${ECHO_CMD} "FFLAGS='-c ${FFLAGS} ${FLAGARCH}'" >> ${WRKSRC}/setup.cfg
- ${ECHO_CMD} "FFLAGS_DBG='-c -g -O ${FLAGARCH}'" >> ${WRKSRC}/setup.cfg
- ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
+ ${ECHO_CMD} "FFLAGS='-c ${FFLAGS} ${FLAGARCH} ${FFLAGARCH}'" >> ${WRKSRC}/setup.cfg
+ ${ECHO_CMD} "FFLAGS_DBG='-c -g -O ${FLAGARCH} ${FFLAGARCH}'" >> ${WRKSRC}/setup.cfg
+ ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
>> ${WRKSRC}/setup.cfg
- ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
+ ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \
>> ${WRKSRC}/setup.cfg