[100662] trunk/dports/math/atlas

[vince at macports.org]

Revision: 100662
          https://trac.macports.org/changeset/100662
Author:   vince at macports.org
Date:     2012-12-19 11:56:39 -0800 (Wed, 19 Dec 2012)
Log Message:
-----------
Further changes to get ppc working (should be OK now).
Threading is disabled on ppc machines, Atlas build only serial libraries.

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

Removed Paths:
-------------
    trunk/dports/math/atlas/files/patch-ATL_DecAtomicCount_ppc_S.diff
    trunk/dports/math/atlas/files/patch-Make_ttune.diff

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2012-12-19 13:49:00 UTC (rev 100661)
+++ trunk/dports/math/atlas/Portfile	2012-12-19 19:56:39 UTC (rev 100662)
@@ -33,8 +33,6 @@
 
 patchfiles                      patch-atlcomp_txt.diff \
                                 patch-emit_mm_c.diff \
-                                patch-Make_ttune.diff \
-                                patch-ATL_DecAtomicCount_ppc_S.diff \
                                 patch-ATL_cmm4x4x128_av_c.diff
 
 
@@ -211,7 +209,6 @@
     configure.args-append       --nof77
 }
 
-# Since ppc machine do have only one processor, disable threads
 if {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
 
     configure.args-append       -t 0
@@ -317,6 +314,9 @@
         reinplace \
         "s|cMVFLAGS=\\\\\"%s\\\\\"|cMVFLAGS=\\\\\"-force_cpusubtype_ALL\ %s\\\\\"|" \
          ${worksrcpath}/include/atlas_mvtesttime.h
+    
+    # Remove all references to threads directories
+    exec sed -i bak -E "/.*threads.*/d" ${worksrcpath}/Make.top
     }
 }
 
@@ -353,7 +353,7 @@
                 ${worksrcpath}/CONFIG/src/atlcomp.txt
         }
     } else {
-        reinplace "s|XXX|'${cc}' '-O2 -fomit-frame-pointer'|" \
+        reinplace "s|XXX|'${cc}' '-Oz -fomit-frame-pointer'|" \
              ${worksrcpath}/CONFIG/src/atlcomp.txt
     }
 

Deleted: trunk/dports/math/atlas/files/patch-ATL_DecAtomicCount_ppc_S.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-ATL_DecAtomicCount_ppc_S.diff	2012-12-19 13:49:00 UTC (rev 100661)
+++ trunk/dports/math/atlas/files/patch-ATL_DecAtomicCount_ppc_S.diff	2012-12-19 19:56:39 UTC (rev 100662)
@@ -1,17 +0,0 @@
---- src/threads/ATL_DecAtomicCount_ppc.S.orig	2012-12-14 12:03:13.000000000 +0100
-+++ src/threads/ATL_DecAtomicCount_ppc.S	2012-12-14 12:03:38.000000000 +0100
-@@ -24,7 +24,6 @@
- ATL_DecAtomicCount:
-    #endif
- #endif
--#error "Code is not reliable on PPC, don't know why"
- /* r3                           r3  */
- /* int ATL_DecAtomicCount(void *vp) */
- RETRY:
-@@ -32,5 +31,5 @@
-    addi  r5, r5, -1   /* decrement value */
-    stwcx. r5, 0, r3   /* attempt to store decremented value back to mem */
-    bne-  RETRY        /* If store failed, retry */
--   mr r3, r5
-+   mr. r3, r5
-    blr

Deleted: trunk/dports/math/atlas/files/patch-Make_ttune.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-Make_ttune.diff	2012-12-19 13:49:00 UTC (rev 100661)
+++ trunk/dports/math/atlas/files/patch-Make_ttune.diff	2012-12-19 19:56:39 UTC (rev 100662)
@@ -1,17 +0,0 @@
---- makes/Make.ttune.orig	2012-12-13 20:56:33.000000000 +0100
-+++ makes/Make.ttune	2012-12-13 20:58:59.000000000 +0100
-@@ -197,6 +197,14 @@
-               ATL_DecAtomicCount_arch.S ; \
-            rm $(BLDdir)/src/threads/atomic.inc ; \
-            echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_mips.o ATL_DecAtomicCount_mips.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
-+	elif $(MAKE) xprobe_atomic_ppc ; then \
-+           cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
-+           cp $(myTHRdir)/ATL_ResetAtomicCount_ppc.S \
-+              ATL_ResetAtomicCount_arch.S ; \
-+           cp $(myTHRdir)/ATL_DecAtomicCount_ppc.S \
-+              ATL_DecAtomicCount_arch.S ; \
-+           rm $(BLDdir)/src/threads/atomic.inc ; \
-+           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_ppc.o ATL_DecAtomicCount_ppc.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
-         else \
-            $(MAKE) iForceUseMutex ; \
-         fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121219/2d56887a/attachment-0001.html>