[hypre] 03/08: reactivate shlibs-interlink.patch

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to branch experimental
in repository hypre.

commit f5d1841a63ce1e460d42a1c0ed775e99698b472f
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Nov 1 12:24:42 2016 +0800

    reactivate shlibs-interlink.patch
    
    links in internal shared libraries to the main shared library
---
 debian/patches/series                 |  2 +-
 debian/patches/shlibs-interlink.patch | 50 +++++++----------------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index fdc2943..a98f025 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-#shlibs-interlink.patch
 configure.patch
 superlu.patch
 install.patch
@@ -8,3 +7,4 @@ install.patch
 #config-for-petsc.patch
 blas.patch
 complex.patch
+shlibs-interlink.patch
diff --git a/debian/patches/shlibs-interlink.patch b/debian/patches/shlibs-interlink.patch
index 29f1d2d..4796623 100644
--- a/debian/patches/shlibs-interlink.patch
+++ b/debian/patches/shlibs-interlink.patch
@@ -8,41 +8,11 @@ This patch has several purposes:
    hypre libs instead of duplicating all of the object files, cutting the
    installed size roughly in half.
 
-Index: hypre-2.10.0b/src/lib/Makefile
+Index: hypre/src/lib/Makefile
 ===================================================================
---- hypre-2.10.0b.orig/src/lib/Makefile
-+++ hypre-2.10.0b/src/lib/Makefile
-@@ -12,29 +12,6 @@
- 
- include ../config/Makefile.config
- 
--SUPERLUFILES = ${HYPRE_FEI_SUPERLU_FILES}
--FEIHYPREFILES = ${HYPRE_FEI_HYPRE_FILES}
--FEMLIFILES = ${HYPRE_FEI_FEMLI_FILES}
--IJMVFILES = ${HYPRE_SRC_TOP_DIR}/IJ_mv/*.o
--EUCLIDFILES = ${HYPRE_SRC_TOP_DIR}/distributed_ls/Euclid/*.o
--PARASAILSFILES = ${HYPRE_SRC_TOP_DIR}/distributed_ls/ParaSails/*.o
--PILUTFILES = ${HYPRE_SRC_TOP_DIR}/distributed_ls/pilut/*.o
--DISTMATRIXFILES = ${HYPRE_SRC_TOP_DIR}/distributed_matrix/*.o
--KRYLOVFILES = ${HYPRE_SRC_TOP_DIR}/krylov/*.o
--MATMATFILES = ${HYPRE_SRC_TOP_DIR}/matrix_matrix/*.o
--MULTIVECFILES = ${HYPRE_SRC_TOP_DIR}/multivector/*.o
--PARCSRLSFILES = ${HYPRE_SRC_TOP_DIR}/parcsr_ls/*.o
--PARCSRMVFILES = ${HYPRE_SRC_TOP_DIR}/parcsr_mv/*.o
--PARCSRBLOCKMVFILES = ${HYPRE_SRC_TOP_DIR}/parcsr_block_mv/*.o
--SEQMVFILES = ${HYPRE_SRC_TOP_DIR}/seq_mv/*.o
--SSTRUCTLSFILES = ${HYPRE_SRC_TOP_DIR}/sstruct_ls/*.o
--SSTRUCTMVFILES = ${HYPRE_SRC_TOP_DIR}/sstruct_mv/*.o
--STRUCTLSFILES = ${HYPRE_SRC_TOP_DIR}/struct_ls/*.o
--STRUCTMVFILES = ${HYPRE_SRC_TOP_DIR}/struct_mv/*.o
--UTILITIESFILES = ${HYPRE_SRC_TOP_DIR}/utilities/*.o
--BLASFILES = ${HYPRE_BLAS_FILES}
--LAPACKFILES = ${HYPRE_LAPACK_FILES}
--
- FILES_HYPRE = \
- $(SUPERLUFILES)\
- $(FEIHYPREFILES)\
-@@ -59,6 +36,27 @@ $(UTILITIESFILES)\
+--- hypre.orig/src/lib/Makefile
++++ hypre/src/lib/Makefile
+@@ -59,6 +59,27 @@ $(UTILITIESFILES)\
  $(BLASFILES)\
  $(LAPACKFILES)
  
@@ -64,13 +34,13 @@ Index: hypre-2.10.0b/src/lib/Makefile
 +  ../distributed_ls/ParaSails/libHYPRE_ParaSails.so \
 +  ../distributed_ls/pilut/libHYPRE_DistributedMatrixPilutSolver.so \
 +  ../parcsr_ls/libHYPRE_parcsr_ls.so \
-+  ../FEI_mv/femli/libHYPRE_mli.so \
-+  ../FEI_mv/fei-hypre/libHYPRE_FEI.so
++  ../FEI_mv/fei-hypre/libHYPRE_FEI.so \
++  ../FEI_mv/femli/lib/libHYPRE_mli.so
 +
  SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so
  SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\
   ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS}
-@@ -71,7 +69,7 @@ SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPA
+@@ -71,7 +92,7 @@ SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPA
  all: libHYPRE${HYPRE_LIB_SUFFIX}
  	cp -fR libHYPRE* ${HYPRE_BUILD_DIR}/lib
  
@@ -79,13 +49,13 @@ Index: hypre-2.10.0b/src/lib/Makefile
  	cp -fR libHYPRE* ${HYPRE_LIB_INSTALL}
  
  clean:
-@@ -105,7 +103,7 @@ libHYPRE.a: ${FILES_HYPRE}
+@@ -105,7 +126,7 @@ libHYPRE.a: ${FILES_HYPRE}
  	${AR} $@ $(UTILITIESFILES) $(BLASFILES) $(LAPACKFILES)
  	${RANLIB} $@
  
 -libHYPRE.so: ${FILES_HYPRE}
 +libHYPRE.so: ${LIBS_HYPRE}
  	@echo  "Building $@ ... "
--	${BUILD_CC_SHARED} -o ${SONAME} ${FILES_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
-+	${BUILD_CC_SHARED} -o ${SONAME} ${LIBS_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+-	${BUILD_CC_SHARED} -o ${SONAME} ${FILES_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ${LDFLAGS}
++	${BUILD_CC_SHARED} -o ${SONAME} ${LIBS_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ${LDFLAGS}
  	ln -s ${SONAME} $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hypre.git