diff options
| author | nia <nia@pkgsrc.org> | 2021-05-15 11:18:58 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-05-15 11:18:58 +0000 |
| commit | c36a560062d2adabfff582d435c2d18bf889fd1d (patch) | |
| tree | f1ac9330d34b0b2204776001a461620c9a6158d3 /math | |
| parent | a484f95cf365808df5434d6789370420921a737e (diff) | |
| download | pkgsrc-c36a560062d2adabfff582d435c2d18bf889fd1d.tar.gz | |
fftw: also move generic simd support to options.mk (on by default)
Diffstat (limited to 'math')
| -rw-r--r-- | math/fftw/Makefile | 13 | ||||
| -rw-r--r-- | math/fftw/options.mk | 17 |
2 files changed, 17 insertions, 13 deletions
diff --git a/math/fftw/Makefile b/math/fftw/Makefile index bc2e67ee23e..a998042ea75 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2021/05/15 11:05:29 nia Exp $ +# $NetBSD: Makefile,v 1.72 2021/05/15 11:18:58 nia Exp $ DISTNAME= fftw-3.3.9 PKGREVISION= 5 @@ -49,17 +49,6 @@ CONFIGURE_DIRS+= build/${p} MAKE_DIRS+= build/${p} .endfor -# Generic compiler vector abstractions. -.if !empty(PKGSRC_COMPILER:M*gcc*) || !empty(PKGSRC_COMPILER:M*clang*) -FFTW_FLOAT_OPTS+= --enable-generic-simd128 --enable-generic-simd256 -FFTW_DOUBLE_OPTS+= --enable-generic-simd128 --enable-generic-simd256 -.endif - -.if ${MACHINE_ARCH} == "x86_64" -FFTW_FLOAT_OPTS+= --enable-sse --enable-sse2 -FFTW_DOUBLE_OPTS+= --enable-sse2 -.endif - pre-configure: .for d in ${CONFIGURE_DIRS} mkdir -p ${WRKSRC:Q}/${d} diff --git a/math/fftw/options.mk b/math/fftw/options.mk index 98a93e8eecd..2ce67946877 100644 --- a/math/fftw/options.mk +++ b/math/fftw/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2021/05/15 11:05:29 nia Exp $ +# $NetBSD: options.mk,v 1.7 2021/05/15 11:18:58 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fftw # fftw (double) and fftwf (single) are always built, you can add @@ -7,6 +7,11 @@ PKG_SUPPORTED_OPTIONS= fftw-fortran openmp mpi fftw-long fftw-quad .include "../../mk/bsd.prefs.mk" +.if !empty(PKGSRC_COMPILER:M*gcc*) || !empty(PKGSRC_COMPILER:M*clang*) +PKG_SUPPORTED_OPTIONS+= simd +PKG_SUGGESTED_OPTIONS+= simd +.endif + .if ${MACHINE_ARCH} == "x86_64" PKG_SUPPORTED_OPTIONS+= avx .endif @@ -21,6 +26,16 @@ FFTW_DOUBLE_OPTS+= --enable-${opt} . endfor .endif +.if !empty(PKG_OPTIONS:Msimd) +# Generic compiler vector abstractions (GCC extension). +FFTW_FLOAT_OPTS+= --enable-generic-simd128 --enable-generic-simd256 +FFTW_DOUBLE_OPTS+= --enable-generic-simd128 --enable-generic-simd256 +. if ${MACHINE_ARCH} == "x86_64" +FFTW_FLOAT_OPTS+= --enable-sse2 +FFTW_DOUBLE_OPTS+= --enable-sse2 +. endif +.endif + .if !empty(PKG_OPTIONS:Mfftw-fortran) USE_LANGUAGES+= fortran77 .else |