[81034] trunk/dports/python
jmr at macports.org
jmr at macports.org
Sat Jul 23 18:58:29 PDT 2011
Revision: 81034
http://trac.macports.org/changeset/81034
Author: jmr at macports.org
Date: 2011-07-23 18:58:26 -0700 (Sat, 23 Jul 2011)
Log Message:
-----------
py*-numpy, py*-scipy: don't use atlas by default (see #30327)
Modified Paths:
--------------
trunk/dports/python/py-numpy/Portfile
trunk/dports/python/py-scipy/Portfile
trunk/dports/python/py25-numpy/Portfile
trunk/dports/python/py25-scipy/Portfile
trunk/dports/python/py26-numpy/Portfile
trunk/dports/python/py26-scipy/Portfile
trunk/dports/python/py27-numpy/Portfile
trunk/dports/python/py27-scipy/Portfile
trunk/dports/python/py31-numpy/Portfile
trunk/dports/python/py31-scipy/Portfile
trunk/dports/python/py32-numpy/Portfile
trunk/dports/python/py32-scipy/Portfile
Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py-numpy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -46,10 +46,6 @@
depends_lib-append port:atlas
}
-# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will
-# link with that supplied by Apple's Accelerate framework.
-default_variants +atlas
-
# when using ATLAS (whether by default or specified by the user via
# the +atlas variant) ...
set gcc_version ""
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py-scipy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -23,45 +23,29 @@
depends_lib-append port:py-numpy \
port:py-nose \
port:SuiteSparse \
- port:swig-python \
- port:atlas
+ port:swig-python
worksrcdir ${distname}
-build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
-destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
python.add_archflags no
universal_variant no
-#pre-fetch {
-# if {![llength [glob -nocomplain ${prefix}/share/swig/*/python/python.swg]]} {
-# ui_error "The python variant of swig is not installed. Please run"
-# ui_error "the following command:"
-# ui_error "$ sudo port -fn upgrade swig +python"
-# error "python variant of swig required"
-# }
-#}
-
post-patch {
reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
}
-variant no_atlas description "Do not use macports atlas libraries" {
- depends_lib-delete port:atlas
+variant atlas description "Use MacPorts ATLAS libraries" {
+ depends_lib-append port:atlas
- build.env-delete ATLAS=${prefix}/lib \
+ build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
- destroot.env-delete ATLAS=${prefix}/lib \
+ destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
}
Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py25-numpy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -46,10 +46,6 @@
depends_lib-append port:atlas
}
-# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will
-# link with that supplied by Apple's Accelerate framework.
-default_variants +atlas
-
# when using ATLAS (whether by default or specified by the user via
# the +atlas variant) ...
set gcc_version ""
Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py25-scipy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -24,45 +24,29 @@
depends_lib-append port:py25-numpy \
port:py25-nose \
port:SuiteSparse \
- port:swig-python \
- port:atlas
+ port:swig-python
worksrcdir ${distname}
-build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
-destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
python.add_archflags no
universal_variant no
-#pre-fetch {
-# if {![llength [glob -nocomplain ${prefix}/share/swig/*/python/python.swg]]} {
-# ui_error "The python variant of swig is not installed. Please run"
-# ui_error "the following command:"
-# ui_error "$ sudo port -fn upgrade swig +python"
-# error "python variant of swig required"
-# }
-#}
-
post-patch {
reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
}
-variant no_atlas description "Do not use macports atlas libraries" {
- depends_lib-delete port:atlas
+variant atlas description "Use MacPorts ATLAS libraries" {
+ depends_lib-append port:atlas
- build.env-delete ATLAS=${prefix}/lib \
+ build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
- destroot.env-delete ATLAS=${prefix}/lib \
+ destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
}
Modified: trunk/dports/python/py26-numpy/Portfile
===================================================================
--- trunk/dports/python/py26-numpy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py26-numpy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -47,10 +47,6 @@
depends_lib-append port:atlas
}
-# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will
-# link with that supplied by Apple's Accelerate framework.
-default_variants +atlas
-
# when using ATLAS (whether by default or specified by the user via
# the +atlas variant) ...
set gcc_version ""
Modified: trunk/dports/python/py26-scipy/Portfile
===================================================================
--- trunk/dports/python/py26-scipy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py26-scipy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -24,33 +24,26 @@
depends_lib-append port:py26-numpy \
port:py26-nose \
port:SuiteSparse \
- port:swig-python \
- port:atlas
+ port:swig-python
worksrcdir ${distname}
-build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
-destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
post-patch {
reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
}
-variant no_atlas description "Do not use macports atlas libraries" {
- depends_lib-delete port:atlas
+variant atlas description "Use MacPorts ATLAS libraries" {
+ depends_lib-append port:atlas
- build.env-delete ATLAS=${prefix}/lib \
+ build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
- destroot.env-delete ATLAS=${prefix}/lib \
+ destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
}
Modified: trunk/dports/python/py27-numpy/Portfile
===================================================================
--- trunk/dports/python/py27-numpy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py27-numpy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -46,10 +46,6 @@
depends_lib-append port:atlas
}
-# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will
-# link with that supplied by Apple's Accelerate framework.
-default_variants +atlas
-
# when using ATLAS (whether by default or specified by the user via
# the +atlas variant) ...
set gcc_version ""
Modified: trunk/dports/python/py27-scipy/Portfile
===================================================================
--- trunk/dports/python/py27-scipy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py27-scipy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -24,33 +24,26 @@
depends_lib-append port:py27-numpy \
port:py27-nose \
port:SuiteSparse \
- port:swig-python \
- port:atlas
+ port:swig-python
worksrcdir ${distname}
-build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
-destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
post-patch {
reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
}
-variant no_atlas description "Do not use macports atlas libraries" {
- depends_lib-delete port:atlas
+variant atlas description "Use MacPorts ATLAS libraries" {
+ depends_lib-append port:atlas
- build.env-delete ATLAS=${prefix}/lib \
+ build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
- destroot.env-delete ATLAS=${prefix}/lib \
+ destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
}
Modified: trunk/dports/python/py31-numpy/Portfile
===================================================================
--- trunk/dports/python/py31-numpy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py31-numpy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -46,10 +46,6 @@
depends_lib-append port:atlas
}
-# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will
-# link with that supplied by Apple's Accelerate framework.
-default_variants +atlas
-
# when using ATLAS (whether by default or specified by the user via
# the +atlas variant) ...
set gcc_version ""
Modified: trunk/dports/python/py31-scipy/Portfile
===================================================================
--- trunk/dports/python/py31-scipy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py31-scipy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -24,33 +24,26 @@
depends_lib-append port:py31-numpy \
port:py31-nose \
port:SuiteSparse \
- port:swig-python \
- port:atlas
+ port:swig-python
worksrcdir ${distname}
-build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
-destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
post-patch {
reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
}
-variant no_atlas description "Do not use macports atlas libraries" {
- depends_lib-delete port:atlas
+variant atlas description "Use MacPorts ATLAS libraries" {
+ depends_lib-append port:atlas
- build.env-delete ATLAS=${prefix}/lib \
+ build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
- destroot.env-delete ATLAS=${prefix}/lib \
+ destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
}
Modified: trunk/dports/python/py32-numpy/Portfile
===================================================================
--- trunk/dports/python/py32-numpy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py32-numpy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -46,10 +46,6 @@
depends_lib-append port:atlas
}
-# use ATLAS by default; if MacPorts' ATLAS is not used, numpy will
-# link with that supplied by Apple's Accelerate framework.
-default_variants +atlas
-
# when using ATLAS (whether by default or specified by the user via
# the +atlas variant) ...
set gcc_version ""
Modified: trunk/dports/python/py32-scipy/Portfile
===================================================================
--- trunk/dports/python/py32-scipy/Portfile 2011-07-24 01:13:49 UTC (rev 81033)
+++ trunk/dports/python/py32-scipy/Portfile 2011-07-24 01:58:26 UTC (rev 81034)
@@ -24,33 +24,26 @@
depends_lib-append port:py32-numpy \
port:py32-nose \
port:SuiteSparse \
- port:swig-python \
- port:atlas
+ port:swig-python
worksrcdir ${distname}
-build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
-destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
- ATLAS=${prefix}/lib \
- LAPACK=${prefix}/lib \
- BLAS=${prefix}/lib
+destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
post-patch {
reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
}
-variant no_atlas description "Do not use macports atlas libraries" {
- depends_lib-delete port:atlas
+variant atlas description "Use MacPorts ATLAS libraries" {
+ depends_lib-append port:atlas
- build.env-delete ATLAS=${prefix}/lib \
+ build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
- destroot.env-delete ATLAS=${prefix}/lib \
+ destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110723/4ab70201/attachment.html>
More information about the macports-changes
mailing list