<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/0d53c593394850b235148a7a7312f44cda253c67">https://github.com/macports/macports-ports/commit/0d53c593394850b235148a7a7312f44cda253c67</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 0d53c59 getdp: fix hpddm dependency
</span>0d53c59 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0d53c593394850b235148a7a7312f44cda253c67
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 16 04:46:21 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> getdp: fix hpddm dependency
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * HPDDM is only used in conjunction with PETSc.
</span><span style='display:block; white-space:pre;color:#404040;'> * GetDP does not add libraries on which HPDDM depends.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57608
</span>---
science/getdp/Portfile | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/getdp/Portfile b/science/getdp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 40e8584..266e130 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/getdp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/getdp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,6 +9,7 @@ PortGroup muniversal 1.0
</span>
name getdp
version 3.0.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science math
license GPL-2+
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +34,11 @@ patchfiles-append patch-fortran_lib.diff \
</span> patch-python_version.diff
depends_lib-append port:arpack \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hpddm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_INCLUDE_PATH=${prefix}/include/hpddm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PETSC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DENABLE_PETSC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SLEPC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_HPDDM=OFF \
</span> -DENABLE_BUILD_LIB=ON \
-DENABLE_BUILD_SHARED=ON \
-DENABLE_BUILD_DYNAMIC=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,11 +48,6 @@ mpi.enforce_variant arpack
</span>
if {[mpi_variant_isset]} {
configure.args-append -DENABLE_MPI=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # hpddm is *always* built using MPI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.enforce_variant hpddm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -DHPDDM_MPI=0
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,12 +58,24 @@ pre-configure {
</span> variant petsc description {Use PETSc linear solver} {
configure.args-replace -DENABLE_PETSC=OFF \
-DENABLE_PETSC=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_SLEPC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SLEPC=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_HPDDM=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_HPDDM=ON
</span> configure.args-append -DPETSC_DIR=${prefix}/lib/petsc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSLEPC_DIR=${prefix}/lib/slepc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSLEPC_DIR=${prefix}/lib/slepc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INCLUDE_PATH=${prefix}/include/hpddm \
</span> depends_lib-append port:petsc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:slepc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:slepc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hpddm
</span> mpi.enforce_variant petsc
mpi.enforce_variant slepc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.enforce_variant hpddm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from the Portfile for hpddm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/57608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![mpi_variant_isset]} {
ui_error "PETSc variant requires an MPI variant"
return -code error "+petsc requires an MPI variant."
</pre><pre style='margin:0'>
</pre>