Revision: 76544 http://trac.macports.org/changeset/76544 Author: vince@macports.org Date: 2011-02-27 12:51:40 -0800 (Sun, 27 Feb 2011) Log Message: ----------- Disable threading on PPC archs (atomic routines do not work reliably) Patch the hardware detection so that it works on eMac (bug #26864) Modified Paths: -------------- trunk/dports/math/atlas/Portfile Added Paths: ----------- trunk/dports/math/atlas/files/patch-archinfo_freebsd_c.diff Modified: trunk/dports/math/atlas/Portfile =================================================================== --- trunk/dports/math/atlas/Portfile 2011-02-27 20:39:23 UTC (rev 76543) +++ trunk/dports/math/atlas/Portfile 2011-02-27 20:51:40 UTC (rev 76544) @@ -31,7 +31,8 @@ ${lapackdist}:lapack patchfiles patch-SpewMakeInc.c.diff \ - patch-emit_mm_c.diff + patch-emit_mm_c.diff \ + patch-archinfo_freebsd_c.diff checksums atlas${version}.tar.bz2 \ sha1 71dd254dad1fc9ad3dec123a561706c9a1a5d7d1 \ @@ -102,6 +103,12 @@ -b ${my_arch} \ -Fa alg -fPIC +# At this point, no threading for ppc/ppc64 + +if {${build_arch} == "ppc" || ${build_arch} == "ppc64"} { + configure.args-append -t 0 +} + # MacPorts defaults to ppc on G4 and G5, so we must override 64-bit detection # by Atlas, even if we are on a G5 @@ -131,11 +138,13 @@ lappend merger_configure_args(ppc) --cc='${configure.cc} -m32' \ -b 32 \ -A 4 \ + -t 0 \ -s gas_ppc \ -Fa alg '-fPIC -m32' lappend merger_configure_args(ppc64) --cc='${configure.cc} -m64' \ -b 64 \ -A 5 \ + -t 0 \ -s gas_ppc \ -Fa alg '-fPIC -m64' lappend merger_configure_args(i386) --cc='${configure.cc} -m32' \ Added: trunk/dports/math/atlas/files/patch-archinfo_freebsd_c.diff =================================================================== --- trunk/dports/math/atlas/files/patch-archinfo_freebsd_c.diff (rev 0) +++ trunk/dports/math/atlas/files/patch-archinfo_freebsd_c.diff 2011-02-27 20:51:40 UTC (rev 76544) @@ -0,0 +1,12 @@ +--- CONFIG/src/backend/archinfo_freebsd.c.orig 2009-02-18 18:47:37.000000000 +0000 ++++ CONFIG/src/backend/archinfo_freebsd.c 2010-01-01 11:45:22.000000000 +0000 +@@ -69,7 +69,7 @@ + if (strstr(res,"c1,2")||strstr(res,"c3,1")||strstr(res,"c3,2")|| + strstr(res,"c3,3")||strstr(res,"c3,4")||strstr(res,"c3,5")|| + strstr(res,"c3,6")||strstr(res,"c4,2")||strstr(res,"c4,5")|| +- strstr(res,"c5,1")||strstr(res,"c10,1")) ++ strstr(res,"c5,1")||strstr(res,"c10,1")||strstr(res,"c4,4")) + mach = PPCG4; + else if (strstr(res,"c11,2")|| strstr(res,"c12,1")|| + strstr(res,"c7,2") || strstr(res,"c7,3") || +