[93701] trunk/dports/math/atlas

[vince at macports.org]

Revision: 93701
          https://trac.macports.org/changeset/93701
Author:   vince at macports.org
Date:     2012-05-28 09:29:10 -0700 (Mon, 28 May 2012)
Log Message:
-----------
Makes atlas configure correctly on PPC/PPC64 machines.

Modified Paths:
--------------
    trunk/dports/math/atlas/Portfile
    trunk/dports/math/atlas/files/patch-atlcomp_txt.diff

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2012-05-28 15:38:05 UTC (rev 93700)
+++ trunk/dports/math/atlas/Portfile	2012-05-28 16:29:10 UTC (rev 93701)
@@ -321,11 +321,21 @@
         reinplace "s|-MPGCC-|${cc}|" ${worksrcpath}/CONFIG/src/probe_comp.c
         reinplace "s|-MPFORTRAN-|${ff}|" ${worksrcpath}/CONFIG/src/probe_comp.c
         reinplace "s|-MPPATH-|${prefix}/bin|" ${worksrcpath}/CONFIG/src/probe_comp.c
-		if {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
+		if {${build_arch} == "ppc"} {
 
-			reinplace "s|XXX|'${cc}' '-fomit-frame-pointer \
-				-O2 -fno-schedule-insns2'|" \
+			reinplace "s|XXX|'${cc}' '-O3 -maltivec \
+			        -mabi=altivec -mcpu=7400 -mtune=7400 \
+			        -fno-schedule-insns \
+				-fschedule-insns2'|" \
 				${worksrcpath}/CONFIG/src/atlcomp.txt
+		} elseif {${build_arch} == "ppc64"} {
+
+			reinplace "s|XXX|'${cc}' '-O3 -maltivec \
+			        -mabi=altivec -mcpu=970 -mtune=970 \
+			        -mvrsave -mpowerpc64 \
+			        -fno-schedule-insns \
+				-fno-schedule-insns2'|" \
+				${worksrcpath}/CONFIG/src/atlcomp.txt
 		} else {
 		
 			reinplace "s|XXX|'${cc}' '-fomit-frame-pointer \

Modified: trunk/dports/math/atlas/files/patch-atlcomp_txt.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-atlcomp_txt.diff	2012-05-28 15:38:05 UTC (rev 93700)
+++ trunk/dports/math/atlas/files/patch-atlcomp_txt.diff	2012-05-28 16:29:10 UTC (rev 93701)
@@ -1,5 +1,5 @@
---- CONFIG/src/atlcomp.txt.orig	2012-05-05 18:11:44.000000000 +0200
-+++ CONFIG/src/atlcomp.txt	2012-05-18 21:24:03.000000000 +0200
+--- CONFIG/src/atlcomp.txt.orig	2012-05-28 17:29:16.000000000 +0200
++++ CONFIG/src/atlcomp.txt	2012-05-28 17:33:21.000000000 +0200
 @@ -43,16 +43,20 @@
     'gcc-4' '-fomit-frame-pointer -mfpmath=sse -O2 -fno-schedule-insns2'
  MACH=Corei2 OS=ALL LVL=1000 COMPS=smc,dmc,skc,dkc,icc,gcc,xcc
@@ -32,3 +32,21 @@
  # 3rd generation opteron (Barcelona and descendents)
  MACH=AMD64K10h OS=ALL LVL=1000 COMPS=f77
     'gfortran' '-fomit-frame-pointer -mfpmath=sse -O2'
+@@ -177,6 +183,8 @@
+    'gcc' '-Os -maltivec -mabi=altivec -mcpu=7400 -mtune=7400'
+ MACH=PPCG4 OS=ALL LVL=1000 COMPS=icc,skc,dkc,xcc,gcc
+    'gcc' '-O3 -maltivec -mabi=altivec -mcpu=7400 -mtune=7400 -fno-schedule-insns -fschedule-insns2'
++MACH=PPCG4 OS=ALL LVL=1010 COMPS=smc,dmc,skc,dkc,icc,gcc,xcc
++    XXX 
+ #
+ # PowerPC970
+ #
+@@ -186,6 +194,8 @@
+    'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -O2'
+ MACH=PPCG5 OS=ALL LVL=1000 COMPS=skc
+    'gcc' '-mpowerpc64 -maltivec -mabi=altivec -mcpu=970 -mtune=970 -O2 -mvrsave'
++MACH=PPCG5 OS=ALL LVL=1010 COMPS=smc,dmc,skc,dkc,icc,gcc,xcc
++    XXX 
+ MACH=POWER7 OS=ALL LVL=1010 COMPS=icc,smc,dmc,skc,dkc,xcc,gcc
+    'gcc' '-O2 -mvsx -mcpu=power7 -mtune=power7 -m64 -mvrsave -funroll-all-loops'
+ MACH=POWER7 OS=ALL LVL=1010 COMPS=f77
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120528/990cfad6/attachment-0001.html>