[93436] trunk/dports/math/atlas/Portfile

[jmr at macports.org]

Revision: 93436
          https://trac.macports.org/changeset/93436
Author:   jmr at macports.org
Date:     2012-05-22 11:15:50 -0700 (Tue, 22 May 2012)
Log Message:
-----------
atlas: fix various brokenness

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

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2012-05-22 17:19:04 UTC (rev 93435)
+++ trunk/dports/math/atlas/Portfile	2012-05-22 18:15:50 UTC (rev 93436)
@@ -89,15 +89,16 @@
 # The clang compiler bundled with Xcode < 4.3 is not suitable for
 # Atlas compiling.
 
-if {[join [split ${xcodeversion} "."] ""] < 43} {
+if {[vercmp $xcodeversion 4.3] < 0} {
 
-    if {[variant_isset clang] || [variant_isset dragonegg46]} {
-    
-        return -code error "Use of Clang is disabled with this version of Xcode."
+    if {[variant_isset clang] || [variant_isset dragonegg]} {
+        pre-fetch {
+            return -code error "Use of Clang is disabled with this version of Xcode."
+        }
     }
-    
+
     if {[variant_isset gcc45]} {
-    
+
         set                     gccversion  4.5
     } elseif {[variant_isset gcc46]} {
     
@@ -111,12 +112,13 @@
     } elseif {[variant_isset mpclang32]} {
     
         configure.cc            ${prefix}/bin/clang-mp-3.2
-    } else {
+    } else {
     
         # Defaults to gcc46
         set                     gccversion  4.6
+        default_variants        +gcc46
     }
-    
+
 } else {
 
     # On Xcode > 4.2 we may use the standard Clang
@@ -164,11 +166,6 @@
     set use_clang               1
 }
 
-if {[info exists depends_skip_archcheck] && [info exists gccversion]} {
-
-    depends_skip_archcheck      gcc${gccnumber}
-}
-
 # No cross-compilation possible
 
 if {${os.arch} == "i386"} {
@@ -244,8 +241,8 @@
     }
 }
 
-if {(${os.major} >= 11 && [sysctl hw.optional.avx1_0] == 1) || \
-    (${os.major} > 8 && [sysctl hw.cpufamily] == 1418770316)} {
+if {(${os.major} >= 11 && ![catch {sysctl hw.optional.avx1_0} result1] && $result1 == 1) || \
+    (${os.major} > 8 && ![catch {sysctl hw.cpufamily} result2] && $result2 == 1418770316)} {
     
     # Core i2 processors (AVX)
     # AVX instruction can’t be used with GCC because Apple bundled as(1)
@@ -295,12 +292,6 @@
                                             -b 64 \
                                             -s gas_x86_64 \
                                             -Fa alg '-fPIC -m64'
-} else {
-
-    lappend merger_configure_args(ppc)
-    lappend merger_configure_args(ppc64)
-    lappend merger_configure_args(i386)
-    lappend merger_configure_args(x86_64)
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120522/4c6c2c10/attachment-0001.html>