<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/671f6cbf884d2d4979a4163ead71e1d3de5e7de0">https://github.com/macports/macports-ports/commit/671f6cbf884d2d4979a4163ead71e1d3de5e7de0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 671f6cbf884d2d4979a4163ead71e1d3de5e7de0
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jul 16 11:56:11 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-cvxopt: use build.env instead of patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since final build is the same.
</span>---
python/py-cvxopt/Portfile | 43 +++++++++++++---------
python/py-cvxopt/files/atlas.patch | 19 ----------
python/py-cvxopt/files/patch-setup.py.diff | 59 +++++-------------------------
3 files changed, 36 insertions(+), 85 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cvxopt/Portfile b/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d774438..363c526 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,43 +32,52 @@ checksums rmd160 0f527df6da0d9d940b337306a7ed7bb55cd63b30 \
</span> python.versions 27 33 34 35 36
if {${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix typo
</span> patchfiles patch-setup.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
variant atlas description {Use ATLAS for BLAS and LAPACK} {
depends_lib-append port:atlas
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append atlas.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BLAS_LIB_DIR="${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_LAPACK_LIB="tatlas" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BLAS_LIB="tatlas"
</span> }
variant gsl description {Build GSL module} {
depends_lib-append port:gsl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s/BUILD_GSL = 0/BUILD_GSL = 1/} setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BUILD_GSL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_GSL_LIB_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_GSL_INC_DIR=${prefix}/include
</span> }
variant fftw description {Build FFTW module} {
depends_lib-append port:fftw-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s/BUILD_FFTW = 0/BUILD_FFTW = 1/} setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BUILD_FFTW=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_FFTW_LIB_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_FFTW_INC_DIR=${prefix}/include
</span> }
variant glpk description {Build GLPK module} {
depends_lib-append port:glpk
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s/BUILD_GLPK = 0/BUILD_GLPK = 1/} setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BUILD_GLPK=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_GLPK_LIB_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_GLPK_INC_DIR=${prefix}/include
</span> }
variant dsdp description {Build DSDP module} {
depends_lib-append port:DSDP
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s/BUILD_DSDP = 0/BUILD_DSDP = 1/} setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BUILD_DSDP=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_DSDP_LIB_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_DSDP_INC_DIR=${prefix}/include
</span> }
default_variants +gsl +glpk +fftw +dsdp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cvxopt/files/atlas.patch b/python/py-cvxopt/files/atlas.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c740fd7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cvxopt/files/atlas.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34f2fbb..43c611e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@ from distutils.core import setup, Extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from glob import glob
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BLAS_LIB_DIR = '/usr/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BLAS_LIB_DIR = '__PREFIX__/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Default names of BLAS and LAPACK libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BLAS_LIB = ['blas']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LAPACK_LIB = ['lapack']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BLAS_LIB = ['tatlas']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LAPACK_LIB = ['tatlas']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLAS_EXTRA_LINK_ARGS = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set environment variable BLAS_NOUNDERSCORES=1 if your BLAS/LAPACK do
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cvxopt/files/patch-setup.py.diff b/python/py-cvxopt/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d9da4c..b83536c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cvxopt/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cvxopt/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34f2fbb..fe1b071 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,37 +18,37 @@ BLAS_NOUNDERSCORES = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_GSL = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing libgsl (used only when BUILD_GSL = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GSL_LIB_DIR = '/usr/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GSL_LIB_DIR = '__PREFIX__/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing the GSL header files (used only when BUILD_GSL = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GSL_INC_DIR = '/usr/include/gsl'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GSL_INC_DIR = '__PREFIX__/include'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set to 1 if you are installing the fftw module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_FFTW = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing libfftw3 (used only when BUILD_FFTW = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FFTW_LIB_DIR = '/usr/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FFTW_LIB_DIR = '__PREFIX__/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing fftw.h (used only when BUILD_FFTW = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FFTW_INC_DIR = '/usr/include'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FFTW_INC_DIR = '__PREFIX__/include'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set to 1 if you are installing the glpk module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_GLPK = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing libglpk (used only when BUILD_GLPK = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GLPK_LIB_DIR = '/usr/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GLPK_LIB_DIR = '__PREFIX__/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing glpk.h (used only when BUILD_GLPK = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GLPK_INC_DIR = '/usr/include'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GLPK_INC_DIR = '__PREFIX__/include'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set to 1 if you are installing the DSDP module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_DSDP = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing libdsdp (used only when BUILD_DSDP = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DSDP_LIB_DIR = '/usr/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DSDP_LIB_DIR = '__PREFIX__/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DSDP_INC_DIR = '/usr/include/dsdp'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DSDP_INC_DIR = '__PREFIX__/include'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # No modifications should be needed below this line.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2015-09-21 22:26:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-07-16 10:48:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DSDP_INC_DIR = os.environ.get("CVXOPT_DSDP_INC_DIR",DSDP_INC_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUITESPARSE_EXT_LIB = os.environ.get("CVXOPT_SUITESPARSE_EXT_LIB",SUITESPARSE_EXT_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUITESPARSE_LIB_DIR = os.environ.get("CVXOPT_AMD_EXT_LIB",SUITESPARSE_LIB_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SUITESPARSE_INC_DIR = os.environ.get("CVXOPT_AMD_EXT_LIB",SUITESPARSE_INC_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SUITESPARSE_INC_DIR = os.environ.get("CVXOPT_AMD_EXT_INC",SUITESPARSE_INC_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extmods = []
</span>
</pre><pre style='margin:0'>
</pre>