[hypre] 01/05: Build with internal not external superlu.

[Drew Parsons]

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

dparsons pushed a commit to tag experimental/2.11.1-1exp2
in repository hypre.

commit e60911cc9a03298e4968eb1e0fa36cbc5a39741a
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Nov 2 18:25:18 2016 +0800

    Build with internal not external superlu.
    
    Currently hypre can only use its internal superlu (v3 not v5)
---
 debian/changelog                              |  6 ++++++
 debian/patches/shlibs-interlink-sublibs.patch | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a8f2fb..08cba82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hypre (2.11.1-1exp2) UNRELEASED; urgency=medium
+
+  * Build with internal not external superlu.
+
+ -- Drew Parsons <dparsons at debian.org>  Wed, 02 Nov 2016 18:25:44 +0800
+
 hypre (2.11.1-1exp1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/shlibs-interlink-sublibs.patch b/debian/patches/shlibs-interlink-sublibs.patch
index 352f403..3b8ac7b 100644
--- a/debian/patches/shlibs-interlink-sublibs.patch
+++ b/debian/patches/shlibs-interlink-sublibs.patch
@@ -2,12 +2,13 @@ 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 = \
+@@ -63,6 +63,19 @@ CXX_COMPILE_FLAGS = \
   ${SUPERLU_INCLUDE}\
   ${CXXINCLUDES}
  
 +
 +HYPRE_LIBS = \
++  ../SuperLU/SRC/libHYPRE_superlu.so \
 +  ../femli/libHYPRE_mli.so \
 +  ../../utilities/libHYPRE_utilities.so \
 +  ../../seq_mv/libHYPRE_seq_mv.so \
@@ -16,12 +17,12 @@ Index: hypre/src/FEI_mv/fei-hypre/Makefile
 +  ../../parcsr_ls/libHYPRE_parcsr_ls.so \
 +  ../../krylov/libHYPRE_krylov.so
 +
-+SYSTEM_LIBS = -lmpi -lm -lmpi++ -lsuperlu
++SYSTEM_LIBS = -lmpi -lm -lmpi++
 +
  HEADERS =\
   cfei-hypre.h\
   cfei_hypre.h\
-@@ -211,9 +223,9 @@ libHYPRE_FEI.a: ${OBJS}
+@@ -211,9 +224,9 @@ libHYPRE_FEI.a: ${OBJS}
  	${AR} $@ ${OBJS}
  	${RANLIB} $@
  
@@ -42,6 +43,7 @@ Index: hypre/src/FEI_mv/femli/Makefile
  #EHEADER**********************************************************************
  
 +HYPRE_LIBS = \
++  ../SuperLU/SRC/libHYPRE_superlu.so \
 +  ../../utilities/libHYPRE_utilities.so \
 +  ../../krylov/libHYPRE_krylov.so \
 +  ../../seq_mv/libHYPRE_seq_mv.so \
@@ -50,8 +52,7 @@ Index: hypre/src/FEI_mv/femli/Makefile
 +  ../../distributed_ls/ParaSails/libHYPRE_ParaSails.so \
 +  ../../parcsr_ls/libHYPRE_parcsr_ls.so
 +
-+SYSTEM_LIBS = -lmpi -lm -lmpi++ -lsuperlu \
-+  ${LAPACKLIBDIRS} ${LAPACKLIBS}
++SYSTEM_LIBS = -lmpi -lm -lmpi++ ${LAPACKLIBDIRS} ${LAPACKLIBS}
  
  include ../../config/Makefile.config
  

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