Mercurial > mxe-octave

changeset 6170:5c8920eacf6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 17 Apr 2022 17:15:37 +0200
parents 7fb56365f235 (current diff) fe02890201ac (diff)
children e61f3c723840
files
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/fftw.mk	Sat Apr 16 20:21:51 2022 +0200
+++ b/src/fftw.mk	Sun Apr 17 17:15:37 2022 +0200
@@ -21,9 +21,15 @@
 
 # some suggested mingw fftw settings from www.fftw.org
 ifeq ($(MXE_SYSTEM),mingw)
-    $(PKG)_CONFIG_OPTS += \
-      --with-combined-threads \
-      --with-incoming-stack-boundary=2
+  $(PKG)_CONFIG_OPTS += \
+    --with-combined-threads \
+    --with-incoming-stack-boundary=2
+endif
+
+ifneq ($(TARGET),i686-w64-mingw32)
+  # FIXME: Should be disabled for any i686 target (not just Windows).
+  $(PKG)_CONFIG_OPTS += \
+    --enable-avx512
 endif
 
 define $(PKG)_UPDATE
@@ -49,7 +55,6 @@
         --enable-sse2 \
         --enable-avx \
         --enable-avx2 \
-        --enable-avx512 \
         $($(PKG)_CONFIG_OPTS) \
         && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS)
@@ -65,7 +70,6 @@
             --enable-sse2 \
             --enable-avx \
             --enable-avx2 \
-            --enable-avx512 \
             $($(PKG)_CONFIG_OPTS) \
             --enable-long-double && $(CONFIGURE_POST_HOOK) ; \
         $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) ; \
@@ -82,7 +86,6 @@
         --enable-sse2 \
         --enable-avx \
         --enable-avx2 \
-        --enable-avx512 \
         $($(PKG)_CONFIG_OPTS) \
         --enable-float && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS)