Diff
Modified: trunk/dports/python/py25-numpy/Portfile (74566 => 74567)
--- trunk/dports/python/py25-numpy/Portfile 2010-12-21 22:22:51 UTC (rev 74566)
+++ trunk/dports/python/py25-numpy/Portfile 2010-12-21 22:53:58 UTC (rev 74567)
@@ -28,7 +28,11 @@
depends_lib-append port:fftw-3 \
port:py25-nose
-build.env-append ARCHFLAGS="${configure.ld_archflags}"
+if {[variant_isset universal] && ![variant_isset atlas]} {
+ build.env-append ARCHFLAGS="${configure.universal_ldflags}"
+} else {
+ build.env-append ARCHFLAGS="${configure.ld_archflags}"
+}
variant atlas \
description {Use the MacPorts' ATLAS libraries \
@@ -50,6 +54,8 @@
# the +atlas variant) ...
set gcc_version ""
if {[variant_isset atlas]} {
+ universal_variant no
+
# see if the user has set -gcc4X to disable using MacPorts'
# compiler; if not, either use what the user set (as +gcc4X) or
# default to gcc44.
@@ -99,12 +105,12 @@
"\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
+ }
}
-variant universal {
- patchfiles-append patch-setup.py.diff
-}
-
post-patch {
reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
${worksrcpath}/numpy/f2py/setup.py
Modified: trunk/dports/python/py26-numpy/Portfile (74566 => 74567)
--- trunk/dports/python/py26-numpy/Portfile 2010-12-21 22:22:51 UTC (rev 74566)
+++ trunk/dports/python/py26-numpy/Portfile 2010-12-21 22:53:58 UTC (rev 74567)
@@ -29,7 +29,11 @@
depends_lib-append port:fftw-3 \
port:py26-nose
-build.env-append ARCHFLAGS="${configure.ld_archflags}"
+if {[variant_isset universal] && ![variant_isset atlas]} {
+ build.env-append ARCHFLAGS="${configure.universal_ldflags}"
+} else {
+ build.env-append ARCHFLAGS="${configure.ld_archflags}"
+}
variant atlas \
description {Use the MacPorts' ATLAS libraries \
@@ -51,6 +55,8 @@
# the +atlas variant) ...
set gcc_version ""
if {[variant_isset atlas]} {
+ universal_variant no
+
# see if the user has set -gcc4X to disable using MacPorts'
# compiler; if not, either use what the user set (as +gcc4X) or
# default to gcc44.
@@ -100,12 +106,12 @@
"\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
+ }
}
-variant universal {
- patchfiles-append patch-setup.py.diff
-}
-
post-patch {
reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
${worksrcpath}/numpy/f2py/setup.py
Modified: trunk/dports/python/py27-numpy/Portfile (74566 => 74567)
--- trunk/dports/python/py27-numpy/Portfile 2010-12-21 22:22:51 UTC (rev 74566)
+++ trunk/dports/python/py27-numpy/Portfile 2010-12-21 22:53:58 UTC (rev 74567)
@@ -28,7 +28,11 @@
depends_lib-append port:fftw-3 \
port:py27-nose
-build.env-append ARCHFLAGS="${configure.ld_archflags}"
+if {[variant_isset universal] && ![variant_isset atlas]} {
+ build.env-append ARCHFLAGS="${configure.universal_ldflags}"
+} else {
+ build.env-append ARCHFLAGS="${configure.ld_archflags}"
+}
variant atlas \
description {Use the MacPorts' ATLAS libraries \
@@ -50,6 +54,8 @@
# the +atlas variant) ...
set gcc_version ""
if {[variant_isset atlas]} {
+ universal_variant no
+
# see if the user has set -gcc4X to disable using MacPorts'
# compiler; if not, either use what the user set (as +gcc4X) or
# default to gcc44.
@@ -99,12 +105,12 @@
"\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
+ }
}
-variant universal {
- patchfiles-append patch-setup.py.diff
-}
-
post-patch {
reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
${worksrcpath}/numpy/f2py/setup.py