diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2004-12-15 09:04:36 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2004-12-15 09:04:36 +0000 |
| commit | 42e50f4530fd57fdac3b6963ec633e293d52f8a6 (patch) | |
| tree | 641cd96fadc22d0c5c1ef3f21f104cd195e78e7e /math/fftw3 | |
| parent | 5cb98ebea017cb2a787af5738bd4de9975e37380 (diff) | |
| download | ports-42e50f4530fd57fdac3b6963ec633e293d52f8a6.tar.gz ports-42e50f4530fd57fdac3b6963ec633e293d52f8a6.zip | |
- Remove i386 Restriction of 3dnow/sse since amd64 has sse and 3dnow
- Remove WITH_SSE Option and auto-detect it under WITH_OPTIMIZED_CFLAGS
- Move auto-detect of 3dnow under WITH_OPTIMIZED_CFLAGS
Notes
Notes:
svn path=/head/; revision=124086
Diffstat (limited to 'math/fftw3')
| -rw-r--r-- | math/fftw3/Makefile | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index dd7b2510c054..8b9167ff378d 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -43,37 +43,33 @@ INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec .endif OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off \ - SMP_THREADS "Enable FFTW SMP threads library" off \ - SSE "Enable SSE optimized routines" off + SMP_THREADS "Enable FFTW SMP threads library" 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" -.endif - -.if ${ARCH}=="i386" -.if ${MACHINE_CPU:M3dnow} -CONFIGURE_ARGS+=--enable-k7 -CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedule-insns \ - -malign-double -fstrict-aliasing -mpreferred-stack-boundary=4 \ - -ffast-math" -.endif - -.if defined(WITH_SSE) +.if ${FFTW3_FLAVOR}=="default" && ${MACHINE_CPU:Msse} +# !!Detect SSE and not SSE2!! +CONFIGURE_ARGS+=--enable-sse2 .if ${OSVERSION} < 500000 USE_GCC= 3.4 .endif -.if ${FFTW3_FLAVOR}=="default" -CONFIGURE_ARGS+=--enable-sse2 .else -.if ${FFTW3_FLAVOR}=="float" +.if ${FFTW3_FLAVOR}=="float" && ${MACHINE_CPU:Msse} CONFIGURE_ARGS+=--enable-sse +.if ${OSVERSION} < 500000 +USE_GCC= 3.4 +.endif .endif .endif -CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O2" +.if ${MACHINE_CPU:M3dnow} +CONFIGURE_ARGS+=--enable-k7 +CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedule-insns \ + -malign-double -fstrict-aliasing -mpreferred-stack-boundary=4 \ + -ffast-math" .endif -.endif #end i386 only options +.endif # end WITH_OPTIMIZED_CFLAGS .if defined(WITH_SMP_THREADS) CONFIGURE_ARGS+=--enable-threads |