<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0fca60c78b40cf4ed697d2f88439a3c93c490a4e">https://github.com/macports/macports-ports/commit/0fca60c78b40cf4ed697d2f88439a3c93c490a4e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0fca60c78b40cf4ed697d2f88439a3c93c490a4e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Apr 17 23:32:44 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> SuiteSparse: use makefile PG
</span>---
math/SuiteSparse/Portfile | 76 ++++++++++++++--------------
math/SuiteSparse/files/patch-CSparse.diff | 20 --------
math/SuiteSparse/files/patch-shared_lib.diff | 11 ----
3 files changed, 39 insertions(+), 68 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/SuiteSparse/Portfile b/math/SuiteSparse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d4d0e1..a6bb69f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/SuiteSparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/SuiteSparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,13 +93,13 @@ subport SuiteSparse_CHOLMOD {
</span> version 3.0.12
depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CAMD port:SuiteSparse_COLAMD port:SuiteSparse_CCOLAMD
depends_lib-append port:metis
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "MY_METIS_LIB=-L${prefix}/lib -lmetis" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MY_METIS_INC=${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "BLAS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LAPACK=-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MY_METIS_LIB="-L${prefix}/lib -lmetis" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MY_METIS_INC="${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLAS="-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LAPACK="-L${prefix}/lib ${linalglib}"
</span> }
license LGPL-2.1+
long_description-append ${subport}: sparse Cholesky factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +107,6 @@ subport SuiteSparse_CHOLMOD {
</span> }
subport SuiteSparse_CSparse {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-CSparse.diff
</span> license LGPL-2.1+
long_description-append ${subport}: a concise sparse matrix package.
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,10 +138,10 @@ subport SuiteSparse_UMFPACK {
</span>
version 5.7.7
depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CHOLMOD
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "BLAS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LAPACK=-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLAS="-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LAPACK="-L${prefix}/lib ${linalglib}"
</span> }
license GPL-2+
long_description-append ${subport}: sparse LU factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,10 +160,10 @@ subport SuiteSparse_SPQR {
</span>
version 2.0.8
depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CHOLMOD port:SuiteSparse_COLAMD
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "BLAS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LAPACK=-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLAS="-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LAPACK="-L${prefix}/lib ${linalglib}"
</span> }
license GPL-2+
long_description-append ${subport}: sparse QR factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,6 +221,8 @@ if {${subport} eq ${name}} {
</span>
cmake.source_dir ${worksrcpath}/${SuiteSparse_name}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "SuiteSparse_config"} {
build.dir ${worksrcpath}/${SuiteSparse_name}
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,32 +232,22 @@ if {${subport} eq ${name}} {
</span>
patchfiles-append patch-shared_lib.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTIMIZATION=${configure.optflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOCC=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.optflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.universal_cflags
configure.cc_archflags
configure.universal_cxxflags
configure.cxx_archflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append TARGET_ARCH=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append TARGET_ARCH="[get_canonical_archflags ld]"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd printenv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args {> SuiteSparse_config/SuiteSparse_config_macports.mk}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/SuiteSparse_config/SuiteSparse_config.mk ${worksrcpath}/SuiteSparse_config/SuiteSparse_config_temp.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/SuiteSparse_config/SuiteSparse_config_macports.mk ${worksrcpath}/SuiteSparse_config/SuiteSparse_config.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W "${worksrcpath}/SuiteSparse_config/" "cat SuiteSparse_config_temp.mk >> SuiteSparse_config.mk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # INSTALL variable has non-standard meaning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.install
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.install \$(DESTDIR)${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MACPORTS_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append INSTALL_DOC=\$(INSTALL)/share/doc/suitesparse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append MACPORTS_PREFIX="${prefix}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMIZATION="${configure.optflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOCC=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid duplicate values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.optflags
</span>
if {${subport} eq "SuiteSparse_CSparse"} {
build.target all
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,8 +255,19 @@ if {${subport} eq ${name}} {
</span> build.target default
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 {*}[glob ${destroot.dir}/*.a] ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc check_copy {directory pattern prefix_directory} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global destroot prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set files [glob -nocomplain -directory ${directory} ${pattern}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${files} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/${prefix_directory}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy {*}${files} ${destroot}${prefix}/${prefix_directory}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_copy ${worksrcpath}/lib * lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_copy ${destroot.dir} *.a lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_copy ${worksrcpath}/include * include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_copy ${worksrcpath}/share/doc/suitesparse-${github.version} * share/doc/suitesparse
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/SuiteSparse/files/patch-CSparse.diff b/math/SuiteSparse/files/patch-CSparse.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a7e1160..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/SuiteSparse/files/patch-CSparse.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CSparse/Lib/Makefile.orig 2017-12-23 11:00:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CSparse/Lib/Makefile 2018-07-06 10:07:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CSparse/Lib. It does not install it for system-wide usage.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY = libcsparse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include ../../SuiteSparse_config/SuiteSparse_config.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- I = -I../Include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CSparse/Demo/Makefile.orig 2017-12-23 11:05:19.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CSparse/Demo/Makefile 2018-07-06 10:16:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include ../../SuiteSparse_config/SuiteSparse_config.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- I = -I../Include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/SuiteSparse/files/patch-shared_lib.diff b/math/SuiteSparse/files/patch-shared_lib.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ecff685..a1e5875 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/SuiteSparse/files/patch-shared_lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/SuiteSparse/files/patch-shared_lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,5 @@
</span> --- SuiteSparse_config/SuiteSparse_config.mk.orig 2018-03-15 07:38:22.000000000 -0700
+++ SuiteSparse_config/SuiteSparse_config.mk 2018-07-06 15:21:40.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,8 +360,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # command line in the Terminal, before doing 'make':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcode-select --install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CF += -fno-common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BLAS = -framework Accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LAPACK = -framework Accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BLAS ?= -framework Accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LAPACK ?= -framework Accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OpenMP is not yet supported by default in clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFOPENMP =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span> @@ -451,7 +451,7 @@
SO_PLAIN = $(LIBRARY).dylib
SO_MAIN = $(LIBRARY).$(SO_VERSION).dylib
</pre><pre style='margin:0'>
</pre>