<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/ba9431be3b5f9f8053ee8858b13e8a75546100a0">https://github.com/macports/macports-ports/commit/ba9431be3b5f9f8053ee8858b13e8a75546100a0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ba9431be3b5f9f8053ee8858b13e8a75546100a0
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 24 07:58:01 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> sundials: Fortran & LAPACK are always required
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The Fortran compiler is only *used* to build the examples.
</span><span style='display:block; white-space:pre;color:#404040;'> However, the *existence* of the Fortran compiler changes the
</span><span style='display:block; white-space:pre;color:#404040;'> resulting build even though it is never called.
</span><span style='display:block; white-space:pre;color:#404040;'> The commit
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/8664f0104650b7fb4448401c9f3eaa464748e4c4
</span><span style='display:block; white-space:pre;color:#404040;'> is therefore incorrect.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/52516
</span>---
math/sundials/Portfile | 56 +++++++++++++++++---------------------------------
1 file changed, 19 insertions(+), 37 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 b8d8f2f..e0d295a 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;'>@@ -6,7 +6,7 @@ PortGroup mpi 1.0
</span>
name sundials
version 2.7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math devel
license bsd
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,19 +37,15 @@ patchfiles-append patch-find_lapack.diff
</span>
depends_lib-append port:SuiteSparse
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.setup \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.setup \
</span> require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.setup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
configure.args-append \
-DEXAMPLES_ENABLE=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCXX_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DF90_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFCMIX_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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFCMIX_ENABLE=ON \
</span> -DKLU_ENABLE=ON \
-DKLU_LIBRARY_DIR=${prefix}/lib \
-DKLU_INCLUDE_DIR=${prefix}/include \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +56,9 @@ pre-configure {
</span> configure.args-delete -DMPI_ENABLE=OFF
configure.args-append -DMPI_ENABLE=ON \
-DMPI_MPICC=${prefix}/bin/${mpi.cc} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPICXX=${prefix}/bin/${mpi.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPIF77=${prefix}/bin/${mpi.f77} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPIF90=${prefix}/bin/${mpi.f90} \
</span> -DMPI_RUN_COMMAND=${prefix}/bin/${mpi.exec}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,38 +88,15 @@ variant examples description {Install Examples} {
</span> -DEXAMPLES_ENABLE=OFF \
-DEXAMPLES_ENABLE=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><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:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCXX_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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DF90_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DF90_ENABLE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFCMIX_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFCMIX_ENABLE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
-DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "You must select either the +accelerate, +atlas, or +openblas variant for linear algebra."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "No linear-algebra variant selected."
</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 accelerate requires examples conflicts atlas openblas description {Use Apple Accelerate Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
</span> configure.args-append -DBLA_VENDOR=Apple
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant atlas requires examples conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant atlas conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
</span> depends_lib-append port:atlas
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,16 +108,22 @@ variant atlas requires examples conflicts accelerate openblas description {Use M
</span> -DLAPACK_LIBRARIES=satlas
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openblas requires examples conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openblas conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
</span> depends_lib-append path:lib/libopenblas.dylib:openblas
require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
configure.args-append -DBLA_VENDOR=OpenBLAS
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset examples] && ![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
</span> default_variants-append +accelerate
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "You must select either the +accelerate, +atlas, or +openblas variant for linear algebra."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "No linear-algebra variant selected."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant doc description {install pdf documentation} {
post-destroot {
</pre><pre style='margin:0'>
</pre>