CVS commit: pkgsrc/math/fftw

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 15 11:18:58 UTC 2021

Modified Files:
        pkgsrc/math/fftw: Makefile options.mk

Log Message:
fftw: also move generic simd support to options.mk (on by default)


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/math/fftw/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/fftw/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/fftw/Makefile
diff -u pkgsrc/math/fftw/Makefile:1.71 pkgsrc/math/fftw/Makefile:1.72
--- pkgsrc/math/fftw/Makefile:1.71      Sat May 15 11:05:29 2021
+++ pkgsrc/math/fftw/Makefile   Sat May 15 11:18:58 2021
@@ -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}

Index: pkgsrc/math/fftw/options.mk
diff -u pkgsrc/math/fftw/options.mk:1.6 pkgsrc/math/fftw/options.mk:1.7
--- pkgsrc/math/fftw/options.mk:1.6     Sat May 15 11:05:29 2021
+++ pkgsrc/math/fftw/options.mk Sat May 15 11:18:58 2021
@@ -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 open
 
 .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