<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/8d1475eef24e49d47280dd40509a335231abcdcf">https://github.com/macports/macports-ports/commit/8d1475eef24e49d47280dd40509a335231abcdcf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8d1475eef24e49d47280dd40509a335231abcdcf
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 19 08:43:19 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> hpddm: use makefile PG
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Increase revision because compiler flags have minor changes.
</span>---
math/hpddm/Portfile | 41 +++++++++++++-------------------
math/hpddm/files/patch-install_name.diff | 8 +++----
2 files changed, 20 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hpddm/Portfile b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37f0f63..3e6c102 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,13 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup mpi 1.0
PortGroup linear_algebra 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span> PortGroup muniversal 1.0
github.setup hpddm hpddm e8639ff91fe0a5d462a62e8764355d7d5cd40de3
# see ${worksrcpath}/include/HPDDM_define.hpp
version 2.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> epoch 1
categories math science
license LGPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,37 +34,27 @@ depends_lib-append port:python27 \
</span> compiler.cxx_standard 2011
patchfiles-append patch-install_name.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://lists.macports.org/pipermail/macports-dev/2018-November/thread.html#39694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+muniversal.arch_tools MPICXX \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPICC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPIF90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
copy ${worksrcpath}/Make.inc/Makefile.OSX ${worksrcpath}/Makefile.inc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MPICXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append MPICXX=${mpi.cxx} \
</span> MPICC=${mpi.cc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MPICC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MPIF90=${configure.f90} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "MPIRUN=${prefix}/bin/${mpi.exec} -np" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPIF90=${mpi.f90} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPIRUN="${prefix}/bin/${mpi.exec} -np" \
</span> MUMPS_INCS=-I${prefix}/include \
PYTHON_INCS=-I${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "BLAS_LIBS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "ARPACK_LIBS=-L${prefix}/lib -larpack" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "SCALAPACK_LIBS=-L${prefix}/lib -lscalapack" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "MUMPS_LIBS=-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "HYPRE_LIBS=-L${prefix}/lib -lHYPRE" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PYTHON_LIBS=-L${frameworks_dir}/Python.framework/Versions/2.7/lib -lpython2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd printenv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args {>> Makefile.inc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach flags {CXXFLAGS CFLAGS} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^${flags}=|override ${flags}+=|g" ${worksrcpath}/Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLAS_LIBS="-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARPACK_LIBS="-L${prefix}/lib -larpack" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SCALAPACK_LIBS="-L${prefix}/lib -lscalapack" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUMPS_LIBS="-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HYPRE_LIBS="-L${prefix}/lib -lHYPRE" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LIBS="-L${frameworks_dir}/Python.framework/Versions/2.7/lib -lpython2.7"
</span> }
# Makefile searches for gfortran in $(MPIF90) name, which is not always true
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hpddm/files/patch-install_name.diff b/math/hpddm/files/patch-install_name.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 440563d..74816eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/hpddm/files/patch-install_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hpddm/files/patch-install_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,13 +6,13 @@
</span> @if [ "$<" = "interface/hpddm_python.cpp" ]; then \
- echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
- ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared -install_name __MACPORTS_PREFIX__/lib/$(notdir $@) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared -install_name __MACPORTS_PREFIX__/lib/$(notdir $@) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
</span> else \
- echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared $< -o $@ ${LIBS}; \
- ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared $< -o $@ ${LIBS}; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared -install_name __MACPORTS_PREFIX__/lib/$(notdir $@) $< -o $@ ${LIBS}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared -install_name __MACPORTS_PREFIX__/lib/$(notdir $@) $< -o $@ ${LIBS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS}; \
</span> fi
${POSTCOMPILE}
</pre><pre style='margin:0'>
</pre>