Skip to content
Permalink
Browse files

hpddm: for dylibs change -shared -> -dynamiclib

  • Loading branch information
MarcusCalhoun-Lopez committed May 15, 2020
1 parent 350922c commit fc4fd764378e98b694478a03cd29187d8a830dd5
Showing with 9 additions and 7 deletions.
  1. +4 −2 math/hpddm/Portfile
  2. +4 −4 math/hpddm/files/patch-install_name.diff
  3. +1 −1 science/getdp/Portfile
@@ -10,7 +10,7 @@ PortGroup muniversal 1.0
github.setup hpddm hpddm 90c799d97bd0d3fa738cb288e5111f131b39753b
# see ${worksrcpath}/include/HPDDM_define.hpp
version 2.0.4
revision 0
revision 1
epoch 1
categories math science
license LGPL-3+
@@ -54,7 +54,9 @@ pre-build {
SCALAPACK_LIBS="-L${prefix}/lib -lscalapack" \
MUMPS_LIBS="-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
HYPRE_LIBS="-L${prefix}/lib -lHYPRE" \
PYTHON_LIBS="-L${frameworks_dir}/Python.framework/Versions/2.7/lib -lpython2.7"
PYTHON_LIBS="-L${frameworks_dir}/Python.framework/Versions/2.7/lib -lpython2.7" \
VERSION=${version} \
CVERSION=[join [lrange [split ${version} .] 0 0] .]
}

# Makefile searches for gfortran in $(MPIF90) name, which is not always true
@@ -6,13 +6,13 @@
@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}; \
+ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
+ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
+ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -dynamiclib -install_name $(PREFIX)/lib/$(notdir $@) -current_version $(VERSION) -compatibility_version $(CVERSION) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
+ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -dynamiclib -install_name $(PREFIX)/lib/$(notdir $@) -current_version $(VERSION) -compatibility_version $(CVERSION) $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
else \
- echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared $< -o $@ ${LIBS}; \
- ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared $< -o $@ ${LIBS}; \
+ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS}; \
+ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -shared -install_name $(PREFIX)/lib/$(notdir $@) $< -o $@ ${LIBS}; \
+ echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -dynamiclib -install_name $(PREFIX)/lib/$(notdir $@) -current_version $(VERSION) -compatibility_version $(CVERSION) $< -o $@ ${LIBS}; \
+ ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} -dynamiclib -install_name $(PREFIX)/lib/$(notdir $@) -current_version $(VERSION) -compatibility_version $(CVERSION) $< -o $@ ${LIBS}; \
fi
${POSTCOMPILE}

@@ -9,7 +9,7 @@ PortGroup muniversal 1.0

name getdp
version 3.3.0
revision 1
revision 2
categories science math
license GPL-2+
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer

0 comments on commit fc4fd76

Please sign in to comment.
You can’t perform that action at this time.