<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/8c9c57ebae29e9db6a51205d102d5d0bfd14a5fb">https://github.com/macports/macports-ports/commit/8c9c57ebae29e9db6a51205d102d5d0bfd14a5fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8c9c57ebae29e9db6a51205d102d5d0bfd14a5fb
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 26 00:22:34 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> sundials2: new port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Sundials 3 makes significant incompatible changes.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55406
</span>---
math/sundials/Portfile | 2 +
math/{sundials => sundials2}/Portfile | 73 ++++++++---------------------
math/sundials2/files/patch-find_lapack.diff | 26 ++++++++++
3 files changed, 48 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials/Portfile b/math/sundials/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73f4751..519f079 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,8 @@ checksums rmd160 f2f77ea9ff638bc5f32daeba30ebda2e0c85073a \
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts sundials2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # use default cmake behavior to find Lapack
patchfiles-append patch-find_lapack.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials/Portfile b/math/sundials2/Portfile
</span>similarity index 70%
copy from math/sundials/Portfile
copy to math/sundials2/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 73f4751..74c5fff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,13 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name sundials
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name sundials2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> categories math devel
license bsd
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers sean openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
description SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,17 @@ long_description SUNDIALS consists of the following five solvers: CVODE\
</span> homepage https://computation.llnl.gov/projects/sundials
master_sites http://computation.llnl.gov/projects/sundials-suite-nonlinear-differential-algebraic-equation-solvers/download/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f2f77ea9ff638bc5f32daeba30ebda2e0c85073a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7bbbff19828c8235422497e11891d07fe02e4021 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts sundials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir sundials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles sundials-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir sundials-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # use default cmake behavior to find Lapack
patchfiles-append patch-find_lapack.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,12 +47,10 @@ mpi.setup \
</span> require_fortran
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_C=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_CXX=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_F77=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_F90=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLAS_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCXX_ENABLE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DF90_ENABLE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_ENABLE=ON \
</span> -DFCMIX_ENABLE=ON \
-DKLU_ENABLE=ON \
-DKLU_LIBRARY_DIR=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,44 +90,12 @@ if {![mpi_variant_isset]} {
</span> }
variant examples description {Install Examples} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # F77 examples fail with:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "_F2C_ARKODE_mass_matrix", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # _farkdlsmassinit_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # _farkfree_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "_F2C_ARKODE_matrix", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # _farkdlsinit_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # _farkfree_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set example_langs {C CXX F90}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lang ${example_langs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_${lang}=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_${lang}=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
</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;'>-variant lapack conflicts fortran_klu description {Enable LAPACK support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from CMakeLists.txt:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LAPACK is not compatible with INT64_T precision
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSUNDIALS_INDEX_TYPE=int32_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_ENABLE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant fortran_klu conflicts lapack description {Build Fortran interface to KLU} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from src/sunlinsol_klu/CMakeLists.txt:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The Fortran interface to KLU is not compatible with INT32_T
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSUNDIALS_INDEX_TYPE=int64_t
</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;'>-if {![variant_isset lapack] && ![variant_isset fortran_klu]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +fortran_klu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
</span> }
variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,10 +139,5 @@ variant doc description {install pdf documentation} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# LICENSE file is installed in a bad location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/LICENSE ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.url https://computation.llnl.gov/projects/sundials/sundials-software
<span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {sundials-(2(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials2/files/patch-find_lapack.diff b/math/sundials2/files/patch-find_lapack.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3f1d9b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials2/files/patch-find_lapack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/SundialsLapack.cmake.orig 2015-07-30 17:07:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/SundialsLapack.cmake 2017-11-10 05:27:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,15 +19,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a working Fortran compiler) or look for them in the most
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # obvious place...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT LAPACK_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(F77_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if(F77_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(FindLAPACK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else(F77_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(LAPACK_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NAMES lapack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PATHS /usr/lib /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$ENV{ProgramFiles}/LAPACK/Lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif(F77_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else(F77_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# find_library(LAPACK_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# NAMES lapack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# PATHS /usr/lib /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# "$ENV{ProgramFiles}/LAPACK/Lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif(F77_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(NOT LAPACK_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If we have the LAPACK libraries, test them
</span></pre><pre style='margin:0'>
</pre>