[114261] trunk/dports/math/fftw-3/Portfile

[ram at macports.org]

Revision: 114261
          https://trac.macports.org/changeset/114261
Author:   ram at macports.org
Date:     2013-12-03 15:25:15 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
math/fftw-3: blacklist clang <= 211.10.1 (#41622, #41673)

Modified Paths:
--------------
    trunk/dports/math/fftw-3/Portfile

Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile	2013-12-03 22:47:27 UTC (rev 114260)
+++ trunk/dports/math/fftw-3/Portfile	2013-12-03 23:25:15 UTC (rev 114261)
@@ -2,10 +2,11 @@
 
 PortSystem      1.0
 PortGroup       muniversal 1.0
+PortGroup       compiler_blacklist_versions 1.0
 
 name            fftw-3
 version         3.3.3
-revision        4
+revision        5
 categories      math
 license         GPL-2+
 platforms       darwin
@@ -41,6 +42,9 @@
     rmd160 f45e97f06ffaf59b5022ea5e33ef240cb5e84e74 \
     sha256 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3
 
+# blacklist older versions of clang which do not handle the --enable-avx option (#41622, #41673)
+compiler.blacklist-append {clang <= 211.10.1}
+
 configure.args \
     --enable-threads \
     --disable-fortran \
@@ -52,7 +56,7 @@
     -fomit-frame-pointer \
     -fstrict-aliasing
 
-if { ![string compare ${configure.compiler} "clang"] } {
+if { [string match *clang* ${configure.compiler}] } {
     set is_clang    1
 } else {
     set is_clang    0
@@ -97,11 +101,20 @@
 subport fftw-3-single {
     configure.args-append --enable-float
 
-    array set merger_configure_args {
-        ppc    "--enable-fma --enable-altivec"
-        ppc64  "--enable-fma --enable-altivec"
-        i386   "--enable-sse"
-        x86_64 "--enable-sse"
+    if { $is_clang == 1 } {
+        array set merger_configure_args {
+            ppc    "--enable-fma --enable-altivec"
+            ppc64  "--enable-fma --enable-altivec"
+            i386   "--enable-sse --enable-avx"
+            x86_64 "--enable-sse --enable-avx"
+        }
+    } else {
+        array set merger_configure_args {
+            ppc    "--enable-fma --enable-altivec"
+            ppc64  "--enable-fma --enable-altivec"
+            i386   "--enable-sse"
+            x86_64 "--enable-sse"
+        }
     }
 
     depends_lib port:fftw-3
@@ -110,6 +123,9 @@
         if {![variant_isset universal]} {
             configure.args-delete --enable-sse2
             configure.args-append --enable-sse
+            if { $is_clang == 1 } {
+                configure.args-append --enable-avx
+            }
         }
     }
 
@@ -143,7 +159,6 @@
 }
 
 subport fftw-3-long {
-    revision 3
     configure.args-append --enable-long-double
 
      array set merger_configure_args {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131203/60edaf3d/attachment.html>