[pkgsrc/trunk]: pkgsrc/math/fftw ughhhhh

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85c23daa115b
branches:  trunk
changeset: 452757:85c23daa115b
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat May 15 10:19:33 2021 +0000

description:
ughhhhh

diffstat:

 math/fftw/Makefile      |  7 ++-----
 math/fftw/buildlink3.mk |  4 +++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 43f320363351 -r 85c23daa115b math/fftw/Makefile
--- a/math/fftw/Makefile        Sat May 15 10:12:31 2021 +0000
+++ b/math/fftw/Makefile        Sat May 15 10:19:33 2021 +0000
@@ -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 @@
 .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 @@
 .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.
diff -r 43f320363351 -r 85c23daa115b math/fftw/buildlink3.mk
--- a/math/fftw/buildlink3.mk   Sat May 15 10:12:31 2021 +0000
+++ b/math/fftw/buildlink3.mk   Sat May 15 10:19:33 2021 +0000
@@ -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_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}