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

[jeremyhu at macports.org]

Revision: 113172
          https://trac.macports.org/changeset/113172
Author:   jeremyhu at macports.org
Date:     2013-11-11 02:24:44 -0800 (Mon, 11 Nov 2013)
Log Message:
-----------
py-numpy: Fix +universal build (#34562).  Maintainer timeout

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2013-11-11 09:43:46 UTC (rev 113171)
+++ trunk/dports/python/py-numpy/Portfile	2013-11-11 10:24:44 UTC (rev 113172)
@@ -30,18 +30,19 @@
     depends_lib-append      port:fftw-3 \
                             port:py${python.version}-nose
 
-    if {[variant_isset universal]} {
-        build.env-append        ARCHFLAGS="${configure.universal_ldflags}"
-        destroot.env-append     ARCHFLAGS="${configure.universal_ldflags}"
-    } else {
-        pre-build {
-            build.env-append        ARCHFLAGS="${configure.cc_archflags}"
-        }
-        pre-destroot {
-            destroot.env-append     ARCHFLAGS="${configure.cc_archflags}"
-        }
-    }
+    # http://trac.macports.org/ticket/34562
+    destroot.env-append \
+        CC="${configure.cc}" \
+        CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+        CXX="${configure.cxx}" \
+        CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
+        OBJC="${configure.objc}" \
+        OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
+        LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
 
+    build.env-append        ARCHFLAGS="[get_canonical_archflags ld]"
+    destroot.env-append     ARCHFLAGS="[get_canonical_archflags ld]"
+
     variant atlas description {Use the MacPorts' ATLAS libraries \
                                instead of Apple's Accelerate framework} {
         build.env-append        ATLAS=${prefix}/lib \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131111/0a39147b/attachment-0001.html>