[hypre] 01/02: restore shlibs-interlink patches
Drew Parsons
dparsons at moszumanska.debian.org
Tue Nov 1 10:58:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository hypre.
commit dd78fe962b86247e2a10fce4a3c6532fd13d43df
Author: Drew Parsons <dparsons at debian.org>
Date: Tue Nov 1 17:17:27 2016 +0800
restore shlibs-interlink patches
place a reference in each libHYPRE sublibrary to the other
sublibraries that it depends on
Note, because of circular dependencies, SHARED_OPTIONS (-Wl,-z,defs)
enforcing symbol definitions are not applied to
src/FEI_mv/femli/Makefile (circular with ../fei-hypre/libHYPRE_FEI.so)
src/parcsr_mv/Makefile (circular with ../parcsr_ls/libHYPRE_parcsr_ls.so)
---
debian/patches/series | 3 +-
...nk.patch => shlibs-interlink-libHYPRE.so.patch} | 0
debian/patches/shlibs-interlink-sublibs.patch | 528 +++++++++++++++++++++
debian/patches/superlu_internal.patch | 24 +-
4 files changed, 543 insertions(+), 12 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 7cfa77a..de57e73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,8 @@ install.patch
#config-for-petsc.patch
blas.patch
complex.patch
-shlibs-interlink.patch
+shlibs-interlink-libHYPRE.so.patch
test.patch
lapack.patch
superlu_internal.patch
+shlibs-interlink-sublibs.patch
diff --git a/debian/patches/shlibs-interlink.patch b/debian/patches/shlibs-interlink-libHYPRE.so.patch
similarity index 100%
rename from debian/patches/shlibs-interlink.patch
rename to debian/patches/shlibs-interlink-libHYPRE.so.patch
diff --git a/debian/patches/shlibs-interlink-sublibs.patch b/debian/patches/shlibs-interlink-sublibs.patch
new file mode 100644
index 0000000..352f403
--- /dev/null
+++ b/debian/patches/shlibs-interlink-sublibs.patch
@@ -0,0 +1,528 @@
+Index: hypre/src/FEI_mv/fei-hypre/Makefile
+===================================================================
+--- hypre.orig/src/FEI_mv/fei-hypre/Makefile
++++ hypre/src/FEI_mv/fei-hypre/Makefile
+@@ -63,6 +63,18 @@ CXX_COMPILE_FLAGS = \
+ ${SUPERLU_INCLUDE}\
+ ${CXXINCLUDES}
+
++
++HYPRE_LIBS = \
++ ../femli/libHYPRE_mli.so \
++ ../../utilities/libHYPRE_utilities.so \
++ ../../seq_mv/libHYPRE_seq_mv.so \
++ ../../parcsr_mv/libHYPRE_parcsr_mv.so \
++ ../../IJ_mv/libHYPRE_IJ_mv.so \
++ ../../parcsr_ls/libHYPRE_parcsr_ls.so \
++ ../../krylov/libHYPRE_krylov.so
++
++SYSTEM_LIBS = -lmpi -lm -lmpi++ -lsuperlu
++
+ HEADERS =\
+ cfei-hypre.h\
+ cfei_hypre.h\
+@@ -211,9 +223,9 @@ libHYPRE_FEI.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_FEI.so: ${OBJS}
++libHYPRE_FEI.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/FEI_mv/femli/Makefile
+===================================================================
+--- hypre.orig/src/FEI_mv/femli/Makefile
++++ hypre/src/FEI_mv/femli/Makefile
+@@ -10,6 +10,17 @@
+ # $Revision$
+ #EHEADER**********************************************************************
+
++HYPRE_LIBS = \
++ ../../utilities/libHYPRE_utilities.so \
++ ../../krylov/libHYPRE_krylov.so \
++ ../../seq_mv/libHYPRE_seq_mv.so \
++ ../../parcsr_mv/libHYPRE_parcsr_mv.so \
++ ../../IJ_mv/libHYPRE_IJ_mv.so \
++ ../../distributed_ls/ParaSails/libHYPRE_ParaSails.so \
++ ../../parcsr_ls/libHYPRE_parcsr_ls.so
++
++SYSTEM_LIBS = -lmpi -lm -lmpi++ -lsuperlu \
++ ${LAPACKLIBDIRS} ${LAPACKLIBS}
+
+ include ../../config/Makefile.config
+
+@@ -156,9 +167,10 @@ libHYPRE_mli.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_mli.so: ${OBJS}
++libHYPRE_mli.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ @echo "Not linking with SHARED_OPTIONS (${SHARED_OPTIONS}) because of circular dependency with ../fei-hypre/libHYPRE_FEI.so"
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/IJ_mv/Makefile
+===================================================================
+--- hypre.orig/src/IJ_mv/Makefile
++++ hypre/src/IJ_mv/Makefile
+@@ -25,6 +25,13 @@ C_COMPILE_FLAGS =\
+ -I$(srcdir)/../parcsr_ls\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../utilities/libHYPRE_utilities.so \
++ ../seq_mv/libHYPRE_seq_mv.so \
++ ../parcsr_mv/libHYPRE_parcsr_mv.so
++
++SYSTEM_LIBS = -lmpi
++
+ HEADERS =\
+ aux_parcsr_matrix.h\
+ aux_par_vector.h\
+@@ -84,9 +91,9 @@ libHYPRE_IJ_mv.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_IJ_mv.so: ${OBJS}
++libHYPRE_IJ_mv.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/distributed_ls/Euclid/Makefile
+===================================================================
+--- hypre.orig/src/distributed_ls/Euclid/Makefile
++++ hypre/src/distributed_ls/Euclid/Makefile
+@@ -25,6 +25,10 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../../hypre/include\
+ ${CINCLUDES}
+
++HYPRE_LIBS = ../../parcsr_mv/libHYPRE_parcsr_mv.so ../../utilities/libHYPRE_utilities.so
++
++SYSTEM_LIBS = -lmpi -lm
++
+ HEADERS =\
+ blas_dh.h\
+ euclid_common.h\
+@@ -114,9 +118,9 @@ libHYPRE_Euclid.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_Euclid.so: ${OBJS}
++libHYPRE_Euclid.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/distributed_ls/ParaSails/Makefile
+===================================================================
+--- hypre.orig/src/distributed_ls/ParaSails/Makefile
++++ hypre/src/distributed_ls/ParaSails/Makefile
+@@ -23,6 +23,13 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../../distributed_matrix\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../../utilities/libHYPRE_utilities.so \
++ ../../IJ_mv/libHYPRE_IJ_mv.so \
++ ../../distributed_matrix/libHYPRE_DistributedMatrix.so
++
++SYSTEM_LIBS = -lmpi -lm ${BLASLIBDIRS} ${BLASLIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}
++
+ HEADERS =\
+ Common.h\
+ ConjGrad.h\
+@@ -84,9 +91,9 @@ libHYPRE_ParaSails.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_ParaSails.so: ${OBJS}
++libHYPRE_ParaSails.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/distributed_ls/pilut/Makefile
+===================================================================
+--- hypre.orig/src/distributed_ls/pilut/Makefile
++++ hypre/src/distributed_ls/pilut/Makefile
+@@ -23,6 +23,12 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../../distributed_matrix\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../../utilities/libHYPRE_utilities.so \
++ ../../distributed_matrix/libHYPRE_DistributedMatrix.so
++
++SYSTEM_LIBS = -lmpi -lm ${BLASLIBDIRS} ${BLASLIBS}
++
+ HEADERS = \
+ HYPRE_DistributedMatrixPilutSolver_protos.h\
+ HYPRE_DistributedMatrixPilutSolver_types.h\
+@@ -78,9 +84,9 @@ libHYPRE_DistributedMatrixPilutSolver.a:
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_DistributedMatrixPilutSolver.so: ${OBJS}
++libHYPRE_DistributedMatrixPilutSolver.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/distributed_matrix/Makefile
+===================================================================
+--- hypre.orig/src/distributed_matrix/Makefile
++++ hypre/src/distributed_matrix/Makefile
+@@ -23,6 +23,8 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../seq_mv\
+ ${CINCLUDES}
+
++LIBS = ../utilities/libHYPRE_utilities.so ../parcsr_mv/libHYPRE_parcsr_mv.so
++
+ EXTRA_HEADERS = internal_protos.h
+
+ HEADERS =\
+@@ -69,9 +71,9 @@ libHYPRE_DistributedMatrix.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_DistributedMatrix.so: ${OBJS}
++libHYPRE_DistributedMatrix.so: ${OBJS} ${LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/krylov/Makefile
+===================================================================
+--- hypre.orig/src/krylov/Makefile
++++ hypre/src/krylov/Makefile
+@@ -22,6 +22,10 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../utilities\
+ ${CINCLUDES}
+
++HYPRE_LIBS = ../utilities/libHYPRE_utilities.so ../multivector/libHYPRE_multivector.so
++
++SYSTEM_LIBS = ${LAPACKLIBDIRS} ${LAPACKLIBS} -lm
++
+ HEADERS =\
+ HYPRE_krylov.h\
+ krylov.h\
+@@ -86,9 +90,9 @@ libHYPRE_krylov.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_krylov.so: ${OBJS}
++libHYPRE_krylov.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/matrix_matrix/Makefile
+===================================================================
+--- hypre.orig/src/matrix_matrix/Makefile
++++ hypre/src/matrix_matrix/Makefile
+@@ -24,6 +24,12 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../parcsr_mv\
+ ${CINCLUDES}
+
++LIBS = \
++ ../parcsr_mv/libHYPRE_parcsr_mv.so \
++ ../distributed_matrix/libHYPRE_DistributedMatrix.so \
++ ../utilities/libHYPRE_utilities.so
++# ../IJ_mv/libHYPRE_IJ_mv.so
++
+ EXTRA_FILES =\
+ internal_protos.h
+
+@@ -64,9 +70,9 @@ libHYPRE_MatrixMatrix.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_MatrixMatrix.so: ${OBJS}
++libHYPRE_MatrixMatrix.so: ${OBJS} ${LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/multivector/Makefile
+===================================================================
+--- hypre.orig/src/multivector/Makefile
++++ hypre/src/multivector/Makefile
+@@ -60,9 +60,9 @@ libHYPRE_multivector.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_multivector.so: ${OBJS}
++libHYPRE_multivector.so: ${OBJS} ../utilities/libHYPRE_utilities.so
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/parcsr_block_mv/Makefile
+===================================================================
+--- hypre.orig/src/parcsr_block_mv/Makefile
++++ hypre/src/parcsr_block_mv/Makefile
+@@ -28,8 +28,15 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../krylov\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../utilities/libHYPRE_utilities.so \
++ ../seq_mv/libHYPRE_seq_mv.so \
++ ../parcsr_mv/libHYPRE_parcsr_mv.so
++
++SYSTEM_LIBS = -lmpi -lm
++
+ LFLAGS = \
+- -L. -lHYPRE_parcsr_block_mv -L../hypre/lib -lHYPRE_krylov \
++ -L../hypre/lib -lHYPRE_parcsr_block_mv -L../hypre/lib -lHYPRE_krylov \
+ -lHYPRE_parcsr_ls -lHYPRE_ParaSails -lHYPRE_Euclid \
+ -lHYPRE_DistributedMatrixPilutSolver -lHYPRE_IJ_mv \
+ -lHYPRE_parcsr_mv -lHYPRE_seq_mv -lHYPRE_DistributedMatrix \
+@@ -114,9 +121,9 @@ libHYPRE_parcsr_block_mv.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_parcsr_block_mv.so: ${OBJS}
++libHYPRE_parcsr_block_mv.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/parcsr_ls/Makefile
+===================================================================
+--- hypre.orig/src/parcsr_ls/Makefile
++++ hypre/src/parcsr_ls/Makefile
+@@ -33,6 +33,22 @@ C_COMPILE_FLAGS =\
+ -I$(srcdir)/../parcsr_block_mv\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../utilities/libHYPRE_utilities.so \
++ ../multivector/libHYPRE_multivector.so \
++ ../krylov/libHYPRE_krylov.so \
++ ../seq_mv/libHYPRE_seq_mv.so \
++ ../parcsr_mv/libHYPRE_parcsr_mv.so \
++ ../parcsr_block_mv/libHYPRE_parcsr_block_mv.so \
++ ../distributed_matrix/libHYPRE_DistributedMatrix.so \
++ ../IJ_mv/libHYPRE_IJ_mv.so \
++ ../matrix_matrix/libHYPRE_MatrixMatrix.so \
++ ../distributed_ls/pilut/libHYPRE_DistributedMatrixPilutSolver.so \
++ ../distributed_ls/ParaSails/libHYPRE_ParaSails.so \
++ ../distributed_ls/Euclid/libHYPRE_Euclid.so
++
++SYSTEM_LIBS = -lmpi -lm $(LAPACKLIBDIRS) $(LAPACKLIBS)
++
+ HEADERS =\
+ HYPRE_parcsr_ls.h\
+ _hypre_parcsr_ls.h\
+@@ -158,9 +174,9 @@ libHYPRE_parcsr_ls.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_parcsr_ls.so: ${OBJS}
++libHYPRE_parcsr_ls.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/parcsr_mv/Makefile
+===================================================================
+--- hypre.orig/src/parcsr_mv/Makefile
++++ hypre/src/parcsr_mv/Makefile
+@@ -23,6 +23,10 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../seq_mv\
+ ${CINCLUDES}
+
++HYPRE_LIBS = ../seq_mv/libHYPRE_seq_mv.so ../utilities/libHYPRE_utilities.so
++
++SYSTEM_LIBS = -lmpi
++
+ HEADERS =\
+ HYPRE_parcsr_mv.h\
+ _hypre_parcsr_mv.h\
+@@ -127,9 +131,10 @@ libHYPRE_parcsr_mv.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_parcsr_mv.so: ${OBJS}
++libHYPRE_parcsr_mv.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ @echo "Not linking with SHARED_OPTIONS (${SHARED_OPTIONS}) because of circular dependency with ../parcsr_ls/libHYPRE_parcsr_ls.so"
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/seq_mv/Makefile
+===================================================================
+--- hypre.orig/src/seq_mv/Makefile
++++ hypre/src/seq_mv/Makefile
+@@ -76,9 +76,9 @@ libHYPRE_seq_mv.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_seq_mv.so: ${OBJS}
++libHYPRE_seq_mv.so: ${OBJS} ../utilities/libHYPRE_utilities.so
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/sstruct_ls/Makefile
+===================================================================
+--- hypre.orig/src/sstruct_ls/Makefile
++++ hypre/src/sstruct_ls/Makefile
+@@ -31,6 +31,20 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../parcsr_ls\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../utilities/libHYPRE_utilities.so \
++ ../multivector/libHYPRE_multivector.so \
++ ../krylov/libHYPRE_krylov.so \
++ ../struct_mv/libHYPRE_struct_mv.so \
++ ../struct_ls/libHYPRE_struct_ls.so \
++ ../seq_mv/libHYPRE_seq_mv.so \
++ ../parcsr_mv/libHYPRE_parcsr_mv.so \
++ ../IJ_mv/libHYPRE_IJ_mv.so \
++ ../parcsr_ls/libHYPRE_parcsr_ls.so \
++ ../sstruct_mv/libHYPRE_sstruct_mv.so
++
++SYSTEM_LIBS = -lmpi -lm
++
+ HEADERS =\
+ HYPRE_sstruct_ls.h\
+ _hypre_sstruct_ls.h\
+@@ -140,9 +154,9 @@ libHYPRE_sstruct_ls.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_sstruct_ls.so: ${OBJS}
++libHYPRE_sstruct_ls.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/sstruct_mv/Makefile
+===================================================================
+--- hypre.orig/src/sstruct_mv/Makefile
++++ hypre/src/sstruct_mv/Makefile
+@@ -26,6 +26,14 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../IJ_mv\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../utilities/libHYPRE_utilities.so \
++ ../struct_mv/libHYPRE_struct_mv.so \
++ ../parcsr_mv/libHYPRE_parcsr_mv.so \
++ ../IJ_mv/libHYPRE_IJ_mv.so
++
++SYSTEM_LIBS = -lmpi
++
+ HEADERS =\
+ HYPRE_sstruct_mv.h\
+ _hypre_sstruct_mv.h\
+@@ -90,9 +98,9 @@ libHYPRE_sstruct_mv.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_sstruct_mv.so: ${OBJS}
++libHYPRE_sstruct_mv.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/struct_ls/Makefile
+===================================================================
+--- hypre.orig/src/struct_ls/Makefile
++++ hypre/src/struct_ls/Makefile
+@@ -25,6 +25,15 @@ C_COMPILE_FLAGS = \
+ -I$(srcdir)/../struct_mv\
+ ${CINCLUDES}
+
++HYPRE_LIBS = \
++ ../utilities/libHYPRE_utilities.so \
++ ../multivector/libHYPRE_multivector.so \
++ ../krylov/libHYPRE_krylov.so \
++ ../parcsr_ls/libHYPRE_parcsr_ls.so \
++ ../struct_mv/libHYPRE_struct_mv.so
++
++SYSTEM_LIBS = -lmpi -lm
++
+ HEADERS =\
+ HYPRE_struct_ls.h\
+ _hypre_struct_ls.h\
+@@ -135,9 +144,9 @@ libHYPRE_struct_ls.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_struct_ls.so: ${OBJS}
++libHYPRE_struct_ls.so: ${OBJS} ${HYPRE_LIBS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/struct_mv/Makefile
+===================================================================
+--- hypre.orig/src/struct_mv/Makefile
++++ hypre/src/struct_mv/Makefile
+@@ -97,9 +97,9 @@ libHYPRE_struct_mv.a: ${OBJS}
+ ${AR} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libHYPRE_struct_mv.so: ${OBJS}
++libHYPRE_struct_mv.so: ${OBJS} ../utilities/libHYPRE_utilities.so
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} $^ -lmpi -lm ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
+Index: hypre/src/utilities/Makefile
+===================================================================
+--- hypre.orig/src/utilities/Makefile
++++ hypre/src/utilities/Makefile
+@@ -100,7 +100,7 @@ libHYPRE_utilities.a: ${OBJS}
+
+ libHYPRE_utilities.so: ${OBJS}
+ @echo "Building $@ ... "
+- ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} -lmpi -lm ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
+
+ ${OBJS}: ${HEADERS}
diff --git a/debian/patches/superlu_internal.patch b/debian/patches/superlu_internal.patch
index 594ab40..92f359a 100644
--- a/debian/patches/superlu_internal.patch
+++ b/debian/patches/superlu_internal.patch
@@ -2,15 +2,17 @@ Index: hypre/src/FEI_mv/SuperLU/SRC/Makefile
===================================================================
--- hypre.orig/src/FEI_mv/SuperLU/SRC/Makefile
+++ hypre/src/FEI_mv/SuperLU/SRC/Makefile
-@@ -43,6 +43,7 @@ include ../make.inc
- include ../../../config/Makefile.config
- CINCLUDES = ${INCLUDES} ${MPIINCLUDE}
- C_COMPILE_FLAGS = \
-+ -DLAPACKLIBS=${LAPACKLIBS}\
- -I$(srcdir)\
- -I$(srcdir)/../../../\
- -I$(srcdir)/../../../utilities\
-@@ -153,13 +154,15 @@ FILES =\
+@@ -55,6 +55,9 @@ HEADERS =\
+ slu_ddefs.h\
+ slu_util.h\
+ supermatrix.h
++
++SYSTEM_LIBS = ${LAPACKLIBDIRS} ${LAPACKLIBS} -lm
++
+ #######################################
+
+ ### LAPACK
+@@ -153,13 +156,15 @@ FILES =\
OBJS = ${FILES:.c=.o}
@@ -28,12 +30,12 @@ Index: hypre/src/FEI_mv/SuperLU/SRC/Makefile
@echo " "
clean:
-@@ -174,7 +177,8 @@ libHYPRE_superlu.a: ${OBJS}
+@@ -174,7 +179,8 @@ libHYPRE_superlu.a: ${OBJS}
libHYPRE_superlu.so: ${OBJS}
@echo "Building $@ ... "
- ${BUILD_CC_SHARED} -o $@ ${OBJS}
-+ ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++ ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
+ ln -s ${SONAME} $@
${OBJS}: ${HEADERS}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hypre.git
More information about the debian-science-commits
mailing list