[113781] trunk/dports/python/py-numpy/Portfile

[sean at macports.org]

Revision: 113781
          https://trac.macports.org/changeset/113781
Author:   sean at macports.org
Date:     2013-11-23 08:39:55 -0800 (Sat, 23 Nov 2013)
Log Message:
-----------
py-numpy: explicitly disable atlas linking when not using variant; fixes #41397

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2013-11-23 16:39:52 UTC (rev 113780)
+++ trunk/dports/python/py-numpy/Portfile	2013-11-23 16:39:55 UTC (rev 113781)
@@ -7,7 +7,7 @@
 
 github.setup            numpy numpy 1.8.0 v
 name                    py-numpy
-
+revision                1
 categories-append       math
 license                 BSD
 platforms               darwin
@@ -44,12 +44,6 @@
 
     variant atlas description {Use the MacPorts' ATLAS libraries \
                                instead of Apple's Accelerate framework} {
-        build.env-append        ATLAS=${prefix}/lib \
-                                LAPACK=${prefix}/lib \
-                                BLAS=${prefix}/lib
-        destroot.env-append     ATLAS=${prefix}/lib \
-                                LAPACK=${prefix}/lib \
-                                BLAS=${prefix}/lib
         depends_lib-append      port:atlas
 
         if {[variant_isset universal]} {
@@ -195,6 +189,23 @@
     }
 
     livecheck.type        none
+
+    if {[variant_isset atlas]} {
+        build.env-append    ATLAS=${prefix}/lib \
+                            LAPACK=${prefix}/lib \
+                            BLAS=${prefix}/lib
+        destroot.env-append ATLAS=${prefix}/lib \
+                            LAPACK=${prefix}/lib \
+                            BLAS=${prefix}/lib
+    } else {
+        build.env-append    ATLAS=None \
+                            LAPACK=/usr/lib/lib \
+                            BLAS=/usr/lib
+        destroot.env-append ATLAS=None \
+                            LAPACK=/usr/lib \
+                            BLAS=/usr/lib
+    }
+
 } else {
     livecheck.regex       archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131123/cb7d9fb2/attachment.html>