diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
| commit | 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch) | |
| tree | 3b556699991305af672fba96e0e8b6bb88bcc7da /math/fftw3 | |
| parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
| download | ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip | |
- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead
PR: 157936
Submitted by: myself
Exp-runs by: pav
Approved by: pav
Notes
Notes:
svn path=/head/; revision=282282
Diffstat (limited to 'math/fftw3')
| -rw-r--r-- | math/fftw3/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 29cb41f99713..da05024549d6 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -27,8 +27,8 @@ USE_PERL5_BUILD=yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-threads -CONFIGURE_ENV= CPPLAGS="${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if defined(FFTW3_FLAVOR) && ${FFTW3_FLAVOR}=="default" MAN1= fftw-wisdom-to-conf.1 fftw-wisdom.1 @@ -43,7 +43,7 @@ OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off .include <bsd.port.pre.mk> .if defined(WITH_OPTIMIZED_CFLAGS) -CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O2 -ffast-math -fomit-frame-pointer" +CFLAGS:= ${CFLAGS:N-O:N-O*} -O2 -ffast-math -fomit-frame-pointer .if ${FFTW3_FLAVOR}=="default" && ${MACHINE_CPU:Msse} # !!Detect SSE and not SSE2!! CONFIGURE_ARGS+=--enable-sse2 @@ -61,7 +61,7 @@ CFLAGS_3DNOW= ${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedule-insns \ .if ${ARCH} != "amd64" CFLAGS_3DNOW+= -malign-double .endif -CONFIGURE_ENV+= CFLAGS="${CFLAGS_3DNOW}" +CFLAGS+= ${CFLAGS_3DNOW} .endif .endif # end WITH_OPTIMIZED_CFLAGS |