[105864] trunk/dports

[vince at macports.org]

Revision: 105864
          https://trac.macports.org/changeset/105864
Author:   vince at macports.org
Date:     2013-05-08 10:20:42 -0700 (Wed, 08 May 2013)
Log Message:
-----------
Forget about OpenMP threading (does not work) in atlas and patches 
numpy in order to link with lib[st]atlas.dylib instead of libatlas.a

Modified Paths:
--------------
    trunk/dports/math/atlas/Portfile
    trunk/dports/python/py-numpy/Portfile

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2013-05-08 16:45:12 UTC (rev 105863)
+++ trunk/dports/math/atlas/Portfile	2013-05-08 17:20:42 UTC (rev 105864)
@@ -343,10 +343,11 @@
     set no_threads  0
 
     # Threading relies on OpenMP if gcc compilers are selected
-    if {${gcc_version} != 0} {
+    # Does not seem to work reliably. Disabled.
+    #if {${gcc_version} != 0} {
 
-        configure.args-append   -Si omp 1
-    }
+        configure.args-append   -Si omp 0
+    #}
 }
 
 # Phases (moonlike)
@@ -606,7 +607,7 @@
             
             # Now add the flags to merger_configure_args(${arch})
             # Same code as the non-universal case
-            lappend merger_configure_args(${arch})  -C acg ${configure.cc}
+            lappend merger_configure_args(${arch})  -C acg ${configure.cc} 
             if {${use_clang} == ""} {
         
                 # GCC
@@ -715,23 +716,23 @@
         reinplace   "s|rm -f|rm -rf|g" ${path}/build/Makefile
 
         # Threading — ensure libgomp is correctly pulled in during link
-        if {${gcc_version} != 0 && ${no_threads} == 0} {
+        #if {${gcc_version} != 0 && ${no_threads} == 0} {
 
-            set gmpfx    ${prefix}/lib/gcc${gcc_version}
-            set arch     [lindex [split [lindex [split $path "/"] end] "-"] 2]
-            if {${arch} != "" && \
-                [file exists ${gmpfx}/${arch}/libgomp.dylib]} {
+        #   set gmpfx    ${prefix}/lib/gcc${gcc_version}
+        #   set arch     [lindex [split [lindex [split $path "/"] end] "-"] 2]
+        #   if {${arch} != "" && \
+        #       [file exists ${gmpfx}/${arch}/libgomp.dylib]} {
 
-                reinplace -E \
-                    "s|(LIBS =.*)|\\1 ${gmpfx}/${arch}/libgomp.dylib|" \
-                    ${path}/build/Make.inc
-            } else {
+        #      reinplace -E \
+        #          "s|(LIBS =.*)|\\1 ${gmpfx}/${arch}/libgomp.dylib|" \
+        #          ${path}/build/Make.inc
+        #  } else {
 
-                reinplace -E \
-                    "s|(LIBS =.*)|\\1 ${gmpfx}/libgomp.dylib|" \
-                    ${path}/build/Make.inc
-            }
-        }
+        #     reinplace -E \
+        #         "s|(LIBS =.*)|\\1 ${gmpfx}/libgomp.dylib|" \
+        #         ${path}/build/Make.inc
+        # }
+        #}
     }
 }
 

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2013-05-08 16:45:12 UTC (rev 105863)
+++ trunk/dports/python/py-numpy/Portfile	2013-05-08 17:20:42 UTC (rev 105864)
@@ -138,6 +138,7 @@
 "\n\nWhen using the +atlas variant (either as the default or setting
 explicitly), one of the +gcc4X variants must be selected.\n"
         }
+
     } else {
         variant universal {
             patchfiles-append       patch-setup.py.diff
@@ -180,6 +181,21 @@
                                 F77="${worksrcpath}/f-wrapper" \
                                 F90="${worksrcpath}/f-wrapper"
         }
+
+		if {[variant_isset atlas]} {
+			# We must link against libSatlas or libTatlas, not libAtlas
+			if {[file exists ${prefix}/lib/libtatlas.dylib]} {
+				reinplace -E \
+					"s|_lib_atlas = \\\['atlas'\\\]|_lib_atlas = \\\['tatlas'\\\]|" \
+					${worksrcpath}/numpy/distutils/system_info.py
+			} elseif {[file exists ${prefix}/lib/libsatlas.dylib]} {
+				reinplace -E \
+					"s|_lib_atlas = \\\['atlas'\\\]|_lib_atlas = \\\['satlas'\\\]|" \
+					${worksrcpath}/numpy/distutils/system_info.py
+			} else {
+				return -code error "Unable to find Atlas dylibs. Bailing out."
+			}
+		}
     }
 
     livecheck.type        none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130508/006b05a4/attachment-0001.html>