<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/56328aea2d1e982781f22607600dcde4c7c2933b">https://github.com/macports/macports-ports/commit/56328aea2d1e982781f22607600dcde4c7c2933b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 56328aea2d1e982781f22607600dcde4c7c2933b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 24 10:35:08 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> sundials: update version 2.7.0->3.1.0
</span>---
math/sundials/Portfile | 62 ++++++++++++++++++++++++------
math/sundials/files/patch-find_lapack.diff | 8 ++--
2 files changed, 55 insertions(+), 15 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 955f695..787d45e 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;'>@@ -5,8 +5,8 @@ PortGroup cmake 1.0
</span> PortGroup mpi 1.0
name sundials
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.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:#e0e0e0;'>@@ -27,8 +27,8 @@ 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 7bbbff19828c8235422497e11891d07fe02e4021 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f2f77ea9ff638bc5f32daeba30ebda2e0c85073a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,10 +41,12 @@ mpi.setup \
</span> require_fortran
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCXX_ENABLE=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DF90_ENABLE=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_ENABLE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE_C=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE_CXX=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE_F77=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE_F90=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLAS_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_ENABLE=OFF \
</span> -DFCMIX_ENABLE=ON \
-DKLU_ENABLE=ON \
-DKLU_LIBRARY_DIR=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,14 +86,46 @@ if {![mpi_variant_isset]} {
</span> }
variant examples description {Install Examples} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # F77 examples fail with:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "_F2C_ARKODE_mass_matrix", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # _farkdlsmassinit_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # _farkfree_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "_F2C_ARKODE_matrix", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # _farkdlsinit_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # _farkfree_ in libsundials_farkode.a(farkode.c.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set example_langs {C CXX F90}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang ${example_langs} {
</span> configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE_${lang}=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE_${lang}=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.args-append \
-DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant lapack conflicts fortran_klu description {Enable LAPACK support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from CMakeLists.txt:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LAPACK is not compatible with INT64_T precision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSUNDIALS_INDEX_TYPE=int32_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_ENABLE=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;'>+variant fortran_klu conflicts lapack description {Build Fortran interface to KLU} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from src/sunlinsol_klu/CMakeLists.txt:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The Fortran interface to KLU is not compatible with INT32_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSUNDIALS_INDEX_TYPE=int64_t
</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;'>+if {![variant_isset lapack] && ![variant_isset fortran_klu]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +fortran_klu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
configure.args-append -DBLA_VENDOR=Apple
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,4 +167,10 @@ variant doc description {install pdf documentation} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# LICENSE file is installed in a bad location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/LICENSE ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.url https://computation.llnl.gov/projects/sundials/sundials-software
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials/files/patch-find_lapack.diff b/math/sundials/files/patch-find_lapack.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f1d9b4..c4f6b4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials/files/patch-find_lapack.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials/files/patch-find_lapack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/SundialsLapack.cmake.orig 2015-07-30 17:07:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/SundialsLapack.cmake 2017-11-10 05:27:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/SundialsLapack.cmake.orig 2017-11-07 16:47:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/SundialsLapack.cmake 2017-11-24 08:06:15.000000000 -0700
</span> @@ -19,15 +19,15 @@
# a working Fortran compiler) or look for them in the most
# obvious place...
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,6 @@
</span> +# "$ENV{ProgramFiles}/LAPACK/Lib"
+# )
+# endif(F77_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(NOT LAPACK_LIBRARIES)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If we have the LAPACK libraries, test them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If the xSDK flag is used, set it to what was found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(LAPACK_LIBRARIES AND TPL_ENABLE_LAPACK)
</span></pre><pre style='margin:0'>
</pre>