Revision: 74439 http://trac.macports.org/changeset/74439 Author: jmr@macports.org Date: 2010-12-17 03:04:28 -0800 (Fri, 17 Dec 2010) Log Message: ----------- py25-numpy, py26-numpy, py27-numpy: remove setting of unused universal_archs_supported variable, and instead set supported_archs, which accomplishes what appears to have been the intent Modified Paths: -------------- trunk/dports/python/py25-numpy/Portfile trunk/dports/python/py26-numpy/Portfile trunk/dports/python/py27-numpy/Portfile Modified: trunk/dports/python/py25-numpy/Portfile =================================================================== --- trunk/dports/python/py25-numpy/Portfile 2010-12-17 10:43:12 UTC (rev 74438) +++ trunk/dports/python/py25-numpy/Portfile 2010-12-17 11:04:28 UTC (rev 74439) @@ -39,7 +39,7 @@ depends_lib-append port:atlas } -# use ALTAS by default; if MacPorts' ATLAS is not used, numpy will +# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will # link with that supplied by Apple's Accelerate framework. default_variants +atlas @@ -71,27 +71,24 @@ set gcc_version "4.5" } - if {${gcc_version} != ""} { - # when using non-Apple GCC for universal install, it can - # create binaries only for the native OS architecture, at - # either 32 or 64 bits. Restrict the supported archs - # accordingly. - if {[variant_isset universal]} { - if { ${os.arch}=="i386" } { - set universal_archs_supported { i386 x86_64 } - } else { - set universal_archs_supported { ppc ppc64 } - } - } + # when using non-Apple GCC for universal install, it can + # create binaries only for the native OS architecture, at + # either 32 or 64 bits. Restrict the supported archs + # accordingly. + if {${os.arch} == "i386"} { + supported_archs i386 x86_64 + } elseif {${os.arch} == "powerpc"} { + supported_archs ppc ppc64 + } - # include all the correct GCC4X port - depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] + # include all the correct GCC4X port + depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] - # force LDFLAGS for correct linking of the linalg module - # for non-Apple GCC compilers - patchfiles-append patch-numpy_linalg_setup.py.diff + # force LDFLAGS for correct linking of the linalg module + # for non-Apple GCC compilers + patchfiles-append patch-numpy_linalg_setup.py.diff - } else { + if {${gcc_version} == ""} { # user specified -gcc4X but +atlas (either as default or # explicitly); do not allow since it might lead to # undetermined runtime execution. Modified: trunk/dports/python/py26-numpy/Portfile =================================================================== --- trunk/dports/python/py26-numpy/Portfile 2010-12-17 10:43:12 UTC (rev 74438) +++ trunk/dports/python/py26-numpy/Portfile 2010-12-17 11:04:28 UTC (rev 74439) @@ -40,7 +40,7 @@ depends_lib-append port:atlas } -# use ALTAS by default; if MacPorts' ATLAS is not used, numpy will +# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will # link with that supplied by Apple's Accelerate framework. default_variants +atlas @@ -72,27 +72,24 @@ set gcc_version "4.5" } - if {${gcc_version} != ""} { - # when using non-Apple GCC for universal install, it can - # create binaries only for the native OS architecture, at - # either 32 or 64 bits. Restrict the supported archs - # accordingly. - if {[variant_isset universal]} { - if { ${os.arch}=="i386" } { - set universal_archs_supported { i386 x86_64 } - } else { - set universal_archs_supported { ppc ppc64 } - } - } + # when using non-Apple GCC for universal install, it can + # create binaries only for the native OS architecture, at + # either 32 or 64 bits. Restrict the supported archs + # accordingly. + if {${os.arch} == "i386"} { + supported_archs i386 x86_64 + } elseif {${os.arch} == "powerpc"} { + supported_archs ppc ppc64 + } - # include all the correct GCC4X port - depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] + # include all the correct GCC4X port + depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] - # force LDFLAGS for correct linking of the linalg module - # for non-Apple GCC compilers - patchfiles-append patch-numpy_linalg_setup.py.diff + # force LDFLAGS for correct linking of the linalg module + # for non-Apple GCC compilers + patchfiles-append patch-numpy_linalg_setup.py.diff - } else { + if {${gcc_version} == ""} { # user specified -gcc4X but +atlas (either as default or # explicitly); do not allow since it might lead to # undetermined runtime execution. Modified: trunk/dports/python/py27-numpy/Portfile =================================================================== --- trunk/dports/python/py27-numpy/Portfile 2010-12-17 10:43:12 UTC (rev 74438) +++ trunk/dports/python/py27-numpy/Portfile 2010-12-17 11:04:28 UTC (rev 74439) @@ -39,7 +39,7 @@ depends_lib-append port:atlas } -# use ALTAS by default; if MacPorts' ATLAS is not used, numpy will +# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will # link with that supplied by Apple's Accelerate framework. default_variants +atlas @@ -71,27 +71,24 @@ set gcc_version "4.5" } - if {${gcc_version} != ""} { - # when using non-Apple GCC for universal install, it can - # create binaries only for the native OS architecture, at - # either 32 or 64 bits. Restrict the supported archs - # accordingly. - if {[variant_isset universal]} { - if { ${os.arch}=="i386" } { - set universal_archs_supported { i386 x86_64 } - } else { - set universal_archs_supported { ppc ppc64 } - } - } + # when using non-Apple GCC for universal install, it can + # create binaries only for the native OS architecture, at + # either 32 or 64 bits. Restrict the supported archs + # accordingly. + if {${os.arch} == "i386"} { + supported_archs i386 x86_64 + } elseif {${os.arch} == "powerpc"} { + supported_archs ppc ppc64 + } - # include all the correct GCC4X port - depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] + # include all the correct GCC4X port + depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] - # force LDFLAGS for correct linking of the linalg module - # for non-Apple GCC compilers - patchfiles-append patch-numpy_linalg_setup.py.diff + # force LDFLAGS for correct linking of the linalg module + # for non-Apple GCC compilers + patchfiles-append patch-numpy_linalg_setup.py.diff - } else { + if {${gcc_version} == ""} { # user specified -gcc4X but +atlas (either as default or # explicitly); do not allow since it might lead to # undetermined runtime execution.