<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6cd5f5eff87e4e31bcb0005cdc5f988bf1f4e7a1">https://github.com/macports/macports-ports/commit/6cd5f5eff87e4e31bcb0005cdc5f988bf1f4e7a1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6cd5f5eff87 sundials: fix indentation
</span>6cd5f5eff87 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6cd5f5eff87e4e31bcb0005cdc5f988bf1f4e7a1
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 21 07:03:20 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> sundials: fix indentation
</span>---
math/sundials/Portfile | 48 +++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 21 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 2984396ab88..ad6c611bc9b 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;'>@@ -36,11 +36,12 @@ conflicts sundials2
</span>
depends_lib-append port:SuiteSparse_KLU
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</span>
mpi.setup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_fortran
</span>
configure.args-append \
-DEXAMPLES_ENABLE_C=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,13 +56,15 @@ configure.args-append \
</span>
pre-configure {
if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_MPI=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_MPI=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPICC=${prefix}/bin/${mpi.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPICXX=${prefix}/bin/${mpi.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPIF77=${prefix}/bin/${mpi.f77} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPIF90=${prefix}/bin/${mpi.f90} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_RUN_COMMAND=${prefix}/bin/${mpi.exec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MPI=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MPI=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPICC=${prefix}/bin/${mpi.cc} \
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_RUN_COMMAND=${prefix}/bin/${mpi.exec}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +72,7 @@ pre-configure {
</span> # this can cause problem when upgrading
# see https://cmake.org/cmake/help/latest/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.html
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON
</span>
# cmake files (e.g. config/SundialsFortran.cmake) create CMakeLists.txt files
# to test for functionality (e.g. a Fortran compiler).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,46 +82,49 @@ configure.args-append \
</span> # Only Apple Clang compilers support tbd files.
# See https://trac.macports.org/ticket/53151
# See https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append SDKROOT=/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT=/
</span>
variant examples description {Install Examples} {
set example_langs {C CXX F90 F77}
foreach lang ${example_langs} {
configure.args-replace \
<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:#e0ffe0;'>+ -DEXAMPLES_ENABLE_${lang}=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE_${lang}=ON
</span> }
configure.args-append \
<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:#e0ffe0;'>+ -DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
</span> use_parallel_build no
}
# from CMakeLists.txt:
# LAPACK is not compatible with INT64_T precision
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSUNDIALS_INDEX_SIZE=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSUNDIALS_INDEX_SIZE=32
</span>
variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBLA_VENDOR=Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=Apple
</span> }
variant atlas conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
depends_lib-append port:atlas
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLA_VENDOR=ATLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=ATLAS
</span>
# FindBLAS.cmake and FindLAPACK.cmake do not seem to find MacPorts Atlas properly
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_LIBRARIES=satlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES=satlas
</span> }
variant openblas conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBLA_VENDOR=OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=OpenBLAS
</span> }
if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
</pre><pre style='margin:0'>
</pre>