CVS commit: pkgsrc/math/fftw

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 15 10:19:33 UTC 2021

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

Log Message:
ughhhhh


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/math/fftw/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/fftw/buildlink3.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.69 pkgsrc/math/fftw/Makefile:1.70
--- pkgsrc/math/fftw/Makefile:1.69      Sat May 15 10:12:31 2021
+++ pkgsrc/math/fftw/Makefile   Sat May 15 10:19:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2021/05/15 10:12:31 nia Exp $
+# $NetBSD: Makefile,v 1.70 2021/05/15 10:19:33 nia Exp $
 
 DISTNAME=      fftw-3.3.9
 PKGREVISION=   5
@@ -50,7 +50,7 @@ MAKE_DIRS+=           build/${p}
 .endfor
 
 # SIMD stuff needs some baseline.
-GCC_REQD+=     4.8
+GCC_REQD+=     4.9
 
 # FFTW offers SIMD runtime detection, but wants explicit build options.
 # These should be generic for all platforms. Compiler needs intrinsics
@@ -61,11 +61,8 @@ FFTW_DOUBLE_OPTS=    --enable-generic-simd1
 .if ${MACHINE_ARCH} == "x86_64"
 FFTW_FLOAT_OPTS+=      --enable-sse --enable-sse2 --enable-avx
 FFTW_DOUBLE_OPTS+=     --enable-sse2 --enable-avx
-# From gcc-4.9 on, these should work trouble-free.
-.  if empty(CC_VERSION:Mgcc-4.*) || !empty(CC_VERSION:Mgcc-4.9.*)
 FFTW_FLOAT_OPTS+=      --enable-avx2 --enable-avx512 --enable-avx-128-fma
 FFTW_DOUBLE_OPTS+=     --enable-avx2 --enable-avx512 --enable-avx-128-fma
-.  endif
 .endif
 
 # TODO: Add the above for other architectures.

Index: pkgsrc/math/fftw/buildlink3.mk
diff -u pkgsrc/math/fftw/buildlink3.mk:1.9 pkgsrc/math/fftw/buildlink3.mk:1.10
--- pkgsrc/math/fftw/buildlink3.mk:1.9  Thu Apr 29 23:30:15 2021
+++ pkgsrc/math/fftw/buildlink3.mk      Sat May 15 10:19:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2021/04/29 23:30:15 thor Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2021/05/15 10:19:33 nia Exp $
 
 BUILDLINK_TREE+=       fftw
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.fftw+=    fftw>=3.0
 BUILDLINK_ABI_DEPENDS.fftw+=   fftw>=3.1nb1
 BUILDLINK_PKGSRCDIR.fftw?=     ../../math/fftw
 
+GCC_REQD+=     4.9
+
 pkgbase := fftw
 .include "../../mk/pkg-build-options.mk"
 .if ${PKG_BUILD_OPTIONS.fftw:Mmpi}