[93457] trunk/dports/math/atlas/Portfile
vince at macports.org
vince at macports.org
Wed May 23 04:12:56 PDT 2012
Revision: 93457
https://trac.macports.org/changeset/93457
Author: vince at macports.org
Date: 2012-05-23 04:12:56 -0700 (Wed, 23 May 2012)
Log Message:
-----------
Oops. Merge the changes made by Ryan in r93436. Sorry for having overlooked them.
Revision Links:
--------------
https://trac.macports.org/changeset/93436
Modified Paths:
--------------
trunk/dports/math/atlas/Portfile
Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile 2012-05-23 10:18:52 UTC (rev 93456)
+++ trunk/dports/math/atlas/Portfile 2012-05-23 11:12:56 UTC (rev 93457)
@@ -89,15 +89,17 @@
# 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]} {
+ if {[variant_isset clang] || [variant_isset dragonegg]} {
- return -code error "Use of Clang is disabled with this version of Xcode."
+ 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]} {
@@ -114,7 +116,7 @@
} else {
# Defaults to gcc46
- set gccversion 4.6
+ default_variants +gcc46
}
} else {
@@ -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/20120523/22b8c7f0/attachment.html>
More information about the macports-changes
mailing list