<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c19a9216be9c19b4793e1c3ad1454121167c78ee">https://github.com/macports/macports-ports/commit/c19a9216be9c19b4793e1c3ad1454121167c78ee</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c19a9216be9c19b4793e1c3ad1454121167c78ee
</span>Author: Szabolcs Horvát <szhorvat@gmail.com>
AuthorDate: Sat Nov 18 21:06:06 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> SuiteSparse: update to 7.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Closes: https://trac.macports.org/ticket/67084
</span><span style='display:block; white-space:pre;color:#404040;'> - SuiteSparse_SLIP_LU is replaced by SuiteSparse_SPEX in this version of SuiteSparse
</span><span style='display:block; white-space:pre;color:#404040;'> - SuiteSparse_CSparse is removed. SuiteSparse_CXSparse should be used instead.
</span><span style='display:block; white-space:pre;color:#404040;'> - Dependencies between subports are updated/corrected
</span><span style='display:block; white-space:pre;color:#404040;'> - Added `LAGraph` library (new in 7.4.0)
</span><span style='display:block; white-space:pre;color:#404040;'> - Re-enable paralell build
</span><span style='display:block; white-space:pre;color:#404040;'> - Work around OpenMP detection by setting ` compiler.log_verbose_output no`
</span><span style='display:block; white-space:pre;color:#404040;'> - Disable building static libraries. This gives the freedom to switch OpenMP on or off in the future without having to modify dependent ports.
</span>---
math/SuiteSparse/Portfile | 212 +++++++++++----------------
math/SuiteSparse/files/patch-Mongoose.diff | 30 ----
math/SuiteSparse/files/patch-shared_lib.diff | 44 ------
3 files changed, 87 insertions(+), 199 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 5e01c3ea856..b193a09fb3c 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup DrTimothyAldenDavis SuiteSparse 5.13.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup DrTimothyAldenDavis SuiteSparse 7.4.0 v
</span> # subports have independent revisions
revision 0
epoch 20200517
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,42 +18,72 @@ long_description SuiteSparse is a single archive that contains all pa
</span>
homepage https://people.engr.tamu.edu/davis/suitesparse.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c418ad3400283e59ea528fe1d80c1dd9422bb998 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8eb2e49e14c0a1a497ed147bc13608e791200e190306ffa50f00be5150fc5306 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 65007739
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8539e35f47729cdc1843e7999b02bca3bc244272 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9f976f83405baf55ba24e9494ce3f526251b972f4554ffe9046c21706be87559 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 85408692
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-shared_lib.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Mongoose.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-KLU-Include-klu_version.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-KLU-Include-klu_version.h.diff
</span>
configure.optflags -O3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/macports/macports-ports/pull/2292#issuecomment-408526461
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-replace -I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We keep SUITESPARSE_USE_STRICT at the default value of OFF and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SUITESPARSE_USE_OPENMP at the default value of ON. This way OpenMP will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# used only when the compiler supports it. OpenMP is enabled on a case-by-case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# basis for some subports by adding 'compiler.openmp_version 4.0' and setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PACKAGENAME_USE_OPENMP=ON for CMake.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Additionally we set:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DBUILD_STATIC_LIBS=OFF: Disable building static libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DSUITESPARSE_INCLUDEDIR_POSTFIX="": Install headers into 'include' instead of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 'include/suitesparse' for compatibility with older packages such as sundials5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DBUILD_STATIC_LIBS=OFF -DSUITESPARSE_INCLUDEDIR_POSTFIX=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Necessary for CMake's FindOpenMP to function correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.log_verbose_output no
</span>
subport SuiteSparse_config {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.13.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup linear_algebra 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.4.0
</span> revision 0
# from the README.txt:
# "[n]o licensing restrictions apply"
license Permissive
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ linalg.setup noveclibfort
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append ${cmake_linalglib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenMP is not essential for SuiteSparse_config, we turn it off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DSUITESPARSE_CONFIG_USE_OPENMP=OFF
</span> }
subport SuiteSparse_GraphBLAS {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 7.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> license Apache-2
long_description-append ${subport}: graph algorithms in the language of linear algebra.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.c_standard 2011
</span> compiler.openmp_version 4.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenMP is essential for reasonable performance with GraphBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DGRAPHBLAS_USE_OPENMP=ON
</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;'>+subport SuiteSparse_LAGraph {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:SuiteSparse_GraphBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append ${subport}: graph algorithms implemented using GraphBLAS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version 4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenMP is essential for reasonable performance with GraphBLAS and LAGraph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DLAGRAPH_USE_OPENMP=ON
</span> }
subport SuiteSparse_Mongoose {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> depends_lib-append port:SuiteSparse_config
license GPL-3
long_description-append ${subport}: graph partitioning.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +91,7 @@ subport SuiteSparse_Mongoose {
</span> }
subport SuiteSparse_AMD {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.4.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +99,7 @@ subport SuiteSparse_AMD {
</span> }
subport SuiteSparse_BTF {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +107,7 @@ subport SuiteSparse_BTF {
</span> }
subport SuiteSparse_CAMD {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.4.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +115,7 @@ subport SuiteSparse_CAMD {
</span> }
subport SuiteSparse_CCOLAMD {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.9.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +123,7 @@ subport SuiteSparse_CCOLAMD {
</span> }
subport SuiteSparse_COLAMD {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.9.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,49 +133,39 @@ subport SuiteSparse_COLAMD {
</span> subport SuiteSparse_CHOLMOD {
PortGroup linear_algebra 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.0.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CAMD port:SuiteSparse_COLAMD port:SuiteSparse_CCOLAMD
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:metis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append 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-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append 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:#ffe0e0;'>- }
</span> license LGPL-2.1+
long_description-append ${subport}: sparse Cholesky factorization.
linalg.setup noveclibfort
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport SuiteSparse_CSparse {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see Doc/ChangeLog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append ${subport}: a concise sparse matrix package.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append ${cmake_linalglib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenMP is not essential for CHOLMOD, we turn it off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCHOLMOD_USE_OPENMP=OFF
</span> }
subport SuiteSparse_CXSparse {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append ${subport}: CSparse Extended.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append ${subport}: a concise extended sparse matrix package.
</span> }
subport SuiteSparse_LDL {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:SuiteSparse_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD
</span> license LGPL-2.1+
long_description-append ${subport}: a very concise LDL' factorization package.
}
subport SuiteSparse_KLU {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.3.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_BTF port:SuiteSparse_COLAMD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_BTF port:SuiteSparse_COLAMD port:SuiteSparse_CHOLMOD
</span> license LGPL-2.1+
long_description-append ${subport}: sparse LU factorization, primarily for circuit simulation.
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,20 +173,19 @@ subport SuiteSparse_KLU {
</span> subport SuiteSparse_UMFPACK {
PortGroup linear_algebra 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.7.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 6.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CHOLMOD
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append 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:#ffe0e0;'>- }
</span> license GPL-2+
long_description-append ${subport}: sparse LU factorization.
linalg.setup noveclibfort
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append ${cmake_linalglib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport SuiteSparse_RBio {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,33 +195,32 @@ subport SuiteSparse_RBio {
</span> subport SuiteSparse_SPQR {
PortGroup linear_algebra 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CHOLMOD port:SuiteSparse_COLAMD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append 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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_COLAMD port:SuiteSparse_CHOLMOD
</span> license GPL-2+
long_description-append ${subport}: sparse QR factorization.
linalg.setup noveclibfort
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append ${cmake_linalglib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport SuiteSparse_SLIP_LU {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This version is incorrect. The real version number is 1.0.2.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remember to fix this when the port is next updated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.0.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport SuiteSparse_SPEX {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.3.0
</span> revision 0
depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_COLAMD \
port:gmp \
port:mpfr
<span style='display:block; white-space:pre;background:#ffe0e0;'>- license {LGPL-3+ GPL-2+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description-append ${subport}: sparse left-looking integer-preserving LU factorization.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append ${subport}: a software package for SParse EXact algebra.
</span> }
if {${subport} eq ${name}} {
depends_lib-append port:SuiteSparse_config \
port:SuiteSparse_GraphBLAS \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_LAGraph \
</span> port:SuiteSparse_Mongoose \
port:SuiteSparse_AMD \
port:SuiteSparse_BTF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,14 +228,13 @@ if {${subport} eq ${name}} {
</span> port:SuiteSparse_CCOLAMD \
port:SuiteSparse_COLAMD \
port:SuiteSparse_CHOLMOD \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:SuiteSparse_CSparse \
</span> port:SuiteSparse_CXSparse \
port:SuiteSparse_LDL \
port:SuiteSparse_KLU \
port:SuiteSparse_UMFPACK \
port:SuiteSparse_RBio \
port:SuiteSparse_SPQR \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:SuiteSparse_SLIP_LU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_SPEX
</span>
master_sites
distfiles
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,6 +255,7 @@ if {${subport} eq ${name}} {
</span> }
} else {
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.1
</span>
compilers.choose cc cpp cxx
compilers.setup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,61 +266,5 @@ if {${subport} eq ${name}} {
</span> set SuiteSparse_name [join [lrange [split ${subport} _] 1 end] _]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "SuiteSparse_GraphBLAS" || ${subport} eq "SuiteSparse_Mongoose"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.source_dir ${worksrcpath}/${SuiteSparse_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "SuiteSparse_config"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${worksrcpath}/${SuiteSparse_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${worksrcpath}/${SuiteSparse_name}/Lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${build.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append TARGET_ARCH="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # INSTALL variable has non-standard meaning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append MACPORTS_PREFIX="${prefix}" \
</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;'>- # avoid duplicate values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.optflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/60492
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx-append {*}${configure.cxxflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "SuiteSparse_CSparse"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc check_copy {directory pattern prefix_directory} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global destroot prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set files [glob -nocomplain -directory ${directory} ${pattern}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${files} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/${prefix_directory}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}${files} ${destroot}${prefix}/${prefix_directory}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_copy ${worksrcpath}/lib * lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_copy ${destroot.dir} *.a lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_copy ${worksrcpath}/include * include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_copy ${worksrcpath}/share/doc/suitesparse-${github.version} * share/doc/suitesparse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.source_dir ${worksrcpath}/${SuiteSparse_name}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/SuiteSparse/files/patch-Mongoose.diff b/math/SuiteSparse/files/patch-Mongoose.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e5bf263b879..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/SuiteSparse/files/patch-Mongoose.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Respect MacPorts C++ flags.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mongoose/CMakeLists.txt.orig 2018-07-05 12:06:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mongoose/CMakeLists.txt 2018-07-08 10:43:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -321,14 +321,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "CMAKE_CXX_COMPILER: " ${BoldBlue} ${CMAKE_CXX_COMPILER_ID} ${ColourReset})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Debug flags for Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_FLAGS_DEBUG "--coverage -g -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_FLAGS_DEBUG "--coverage -g")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "--coverage -g")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Debug flags for GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.6")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,7 +339,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using Intel C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_CXX_FLAGS "-O3 -no-prec-div -xHOST -ipo -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-prec-div -xHOST -ipo -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Debug flags for Intel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -fwrapv")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_FLAGS_DEBUG "-g -O0 -Wall")
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e13d66e457..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Avoid using rpath.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- SuiteSparse_config/SuiteSparse_config.mk.orig 2021-03-03 15:04:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SuiteSparse_config/SuiteSparse_config.mk 2021-04-19 11:53:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -374,7 +374,7 @@
</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;'>-- LDLIBS += -rpath $(INSTALL_LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -464,7 +464,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SO_TARGET = $(LIBRARY).$(VERSION).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SO_OPTS += -dynamiclib -compatibility_version $(SO_VERSION) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -current_version $(VERSION) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wl,-install_name -Wl,@rpath/$(SO_MAIN) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wl,-install_name -Wl,$(MACPORTS_PREFIX)/lib/$(SO_MAIN) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -shared -undefined dynamic_lookup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # When a Mac *.dylib file is moved, this command is required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to change its internal name to match its location in the filesystem:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GraphBLAS/CMakeLists.txt.orig 2021-03-03 15:04:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GraphBLAS/CMakeLists.txt 2021-04-19 11:48:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy ( SET CMP0048 NEW )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy ( SET CMP0054 NEW )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ( )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set ( CMAKE_MACOSX_RPATH TRUE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # version of SuiteSparse:GraphBLAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ( GraphBLAS_DATE "Jan 19, 2021")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mongoose/CMakeLists.txt.orig 2021-03-03 15:04:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mongoose/CMakeLists.txt 2021-04-19 11:55:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +188,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build the Mongoose library for dynamic linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_MACOSX_RPATH 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_library(mongoose_dylib SHARED ${MONGOOSE_LIB_FILES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(TARGET mongoose_dylib PROPERTY POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(mongoose_dylib
</span></pre><pre style='margin:0'>
</pre>