Revision: 76523 http://trac.macports.org/changeset/76523 Author: vince@macports.org Date: 2011-02-26 22:40:37 -0800 (Sat, 26 Feb 2011) Log Message: ----------- Force G4 arch even if G5 CPU are installed. Modified Paths: -------------- trunk/dports/math/atlas/Portfile Modified: trunk/dports/math/atlas/Portfile =================================================================== --- trunk/dports/math/atlas/Portfile 2011-02-27 06:05:35 UTC (rev 76522) +++ trunk/dports/math/atlas/Portfile 2011-02-27 06:40:37 UTC (rev 76523) @@ -33,10 +33,10 @@ patchfiles patch-SpewMakeInc.c.diff \ patch-emit_mm_c.diff -checksums atlas3.9.37.tar.bz2 \ +checksums atlas${version}.tar.bz2 \ sha1 71dd254dad1fc9ad3dec123a561706c9a1a5d7d1 \ rmd160 87bb689e7a956df74ea4091552ac3cfd30430093 \ - lapack-3.3.0.tgz \ + lapack-${lapackversion}.tgz \ md5 84213fca70936cc5f1b59a7b1bf71697 \ sha1 4f0b103da52110e7f60d1d7676727103aca9785e \ rmd160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e @@ -105,12 +105,18 @@ # MacPorts defaults to ppc on G4 and G5, so we must override 64-bit detection # by Atlas, even if we are on a G5 -if {${build_arch} == "ppc"} { +if {${build_arch} == "ppc" && ! [variant_isset universal]} { configure.args-delete --cc=${configure.cc} \ -Fa alg -fPIC configure.args-append --cc='${configure.cc} -m32' \ + -A PPCG4 \ -Fa alg '-fPIC -m32' + + if {[exec sysctl -n hw.cpu64bit_capable] == 1} { + ui_msg "--- Compiling for G4 arch (ppc) on a G5 (ppc64) machine." + ui_msg "--- This will lead to inferior performance." + } } if { [variant_isset universal] } { @@ -121,10 +127,12 @@ lappend merger_configure_args(ppc) --cc='${configure.cc} -m32' \ -b 32 \ + -A PPCG4 \ -s gas_ppc \ -Fa alg '-fPIC -m32' lappend merger_configure_args(ppc64) --cc='${configure.cc} -m64' \ -b 64 \ + -A PPCG5 \ -s gas_ppc \ -Fa alg '-fPIC -m64' lappend merger_configure_args(i386) --cc='${configure.cc} -m32' \