[114154] trunk/dports/math/gsl/Portfile

[nicos at macports.org]

Revision: 114154
          https://trac.macports.org/changeset/114154
Author:   nicos at macports.org
Date:     2013-11-30 06:50:33 -0800 (Sat, 30 Nov 2013)
Log Message:
-----------
gsl: enable avx optimization for proper compilers (ticket #41554)

Modified Paths:
--------------
    trunk/dports/math/gsl/Portfile

Modified: trunk/dports/math/gsl/Portfile
===================================================================
--- trunk/dports/math/gsl/Portfile	2013-11-30 14:30:04 UTC (rev 114153)
+++ trunk/dports/math/gsl/Portfile	2013-11-30 14:50:33 UTC (rev 114154)
@@ -6,7 +6,7 @@
 name                gsl
 conflicts           gsl-devel
 version             1.16
-revision            1
+revision            2
 categories          math science
 maintainers         openmaintainer gmail.com:dtakahashi42
 license             GPL-3+
@@ -56,41 +56,53 @@
     }
 }
 
-variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 description "Use GCC 4.3 for compilation of GSL" {
+variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 mpclang33 description "Use GCC 4.3 for compilation of GSL" {
     configure.compiler          macports-gcc-4.3
 }
 
-variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 description "Use GCC 4.4 for compilation of GSL" {
+variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 mpclang33 description "Use GCC 4.4 for compilation of GSL" {
     configure.compiler          macports-gcc-4.4
 }
 
-variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 description "Use GCC 4.5 for compilation of GSL" {
+variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 mpclang33 description "Use GCC 4.5 for compilation of GSL" {
     configure.compiler          macports-gcc-4.5
 }
 
-variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 description "Use GCC 4.6 for compilation of GSL" {
+variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 mpclang33 description "Use GCC 4.6 for compilation of GSL" {
     configure.compiler          macports-gcc-4.6
 }
 
-variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 description "Use GCC 4.7 for compilation of GSL" {
+variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 mpclang33 description "Use GCC 4.7 for compilation of GSL" {
     configure.compiler          macports-gcc-4.7
 }
 
-variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 description "Use GCC 4.8 for compilation of GSL" {
+variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 mpclang33 description "Use GCC 4.8 for compilation of GSL" {
     configure.compiler          macports-gcc-4.8
 }
 
+variant mpclang33 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 description "Use clang 3.3 for compilation of GSL" {
+    configure.compiler          macports-clang-3.3
+}
+
 variant optimize description "Provide further optimization options (depending on compiler used)" {
-    configure.cflags-append     "-ftree-vectorize -O3"
+    configure.cflags-append     "-O3"
 }
 
 platform darwin i386 {
     if { [variant_isset optimize] } {
-        if { [variant_isset gcc43] } {
+        if { [variant_isset mpclang33] } {
             configure.cflags-append "-march=native"
-        } elseif { [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] } {
+        } elseif { [variant_isset gcc43] } {
+            configure.cflags-append "-ftree-vectorize -march=native"
+        } elseif { [variant_isset gcc44] || [variant_isset gcc45] ||
+                   [variant_isset gcc46] || [variant_isset gcc47] } {
             # Currently, gcc cannot compile AVX instructions on OSX
-            configure.cflags-append "-march=native -mno-avx"
+            configure.cflags-append "-ftree-vectorize -march=native -mno-avx"
+        } else {
+            #Default compiler. Check if the compiler supports "native" architecture
+            if { [string match "clang" ${configure.compiler}] } {
+                configure.cflags-append "-march=native"
+            }
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131130/d1da4ba4/attachment.html>