[hypre] 03/05: refresh patches for superlu

[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 bc1f8c12d840696981fa7d14eebf494f391dcfb5
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Nov 13 22:42:12 2017 +0800

    refresh patches for superlu
    
    src/FEI_mv/SuperLU is no longer used
---
 debian/patches/shlibs-interlink-libHYPRE.so.patch |  9 ++++-----
 debian/patches/shlibs-interlink-sublibs.patch     | 10 ++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/patches/shlibs-interlink-libHYPRE.so.patch b/debian/patches/shlibs-interlink-libHYPRE.so.patch
index 1d0ebb5..3284d7c 100644
--- a/debian/patches/shlibs-interlink-libHYPRE.so.patch
+++ b/debian/patches/shlibs-interlink-libHYPRE.so.patch
@@ -12,7 +12,7 @@ Index: hypre/src/lib/Makefile
 ===================================================================
 --- hypre.orig/src/lib/Makefile
 +++ hypre/src/lib/Makefile
-@@ -57,6 +57,28 @@ $(UTILITIESFILES)\
+@@ -57,6 +57,27 @@ $(UTILITIESFILES)\
  $(BLASFILES)\
  $(LAPACKFILES)
  
@@ -35,13 +35,12 @@ Index: hypre/src/lib/Makefile
 +  ../distributed_ls/pilut/libHYPRE_DistributedMatrixPilutSolver.so \
 +  ../parcsr_ls/libHYPRE_parcsr_ls.so \
 +  ../FEI_mv/fei-hypre/libHYPRE_FEI.so \
-+  ../FEI_mv/femli/libHYPRE_mli.so \
-+  ../FEI_mv/SuperLU/SRC/libHYPRE_superlu.so
++  ../FEI_mv/femli/libHYPRE_mli.so
 +
  SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so
  SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\
   ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS}
-@@ -69,7 +91,7 @@ SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPA
+@@ -69,7 +90,7 @@ SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPA
  all: libHYPRE${HYPRE_LIB_SUFFIX}
  	cp -fR libHYPRE* ${HYPRE_BUILD_DIR}/lib
  
@@ -50,7 +49,7 @@ Index: hypre/src/lib/Makefile
  	cp -fR libHYPRE* ${HYPRE_LIB_INSTALL}
  
  clean:
-@@ -103,7 +125,7 @@ libHYPRE.a: ${FILES_HYPRE}
+@@ -103,7 +124,7 @@ libHYPRE.a: ${FILES_HYPRE}
  	${AR} $@ $(UTILITIESFILES) $(BLASFILES) $(LAPACKFILES)
  	${RANLIB} $@
  
diff --git a/debian/patches/shlibs-interlink-sublibs.patch b/debian/patches/shlibs-interlink-sublibs.patch
index 0d9a2ee..d2cf94f 100644
--- a/debian/patches/shlibs-interlink-sublibs.patch
+++ b/debian/patches/shlibs-interlink-sublibs.patch
@@ -2,13 +2,12 @@ Index: hypre/src/FEI_mv/fei-hypre/Makefile
 ===================================================================
 --- hypre.orig/src/FEI_mv/fei-hypre/Makefile
 +++ hypre/src/FEI_mv/fei-hypre/Makefile
-@@ -64,6 +64,19 @@ CXX_COMPILE_FLAGS = \
+@@ -64,6 +64,18 @@ CXX_COMPILE_FLAGS = \
   ${DSUPERLU_INCLUDE}\
   ${CXXINCLUDES}
  
 +
 +HYPRE_LIBS = \
-+  ../SuperLU/SRC/libHYPRE_superlu.so \
 +  ../femli/libHYPRE_mli.so \
 +  ../../utilities/libHYPRE_utilities.so \
 +  ../../seq_mv/libHYPRE_seq_mv.so \
@@ -22,7 +21,7 @@ Index: hypre/src/FEI_mv/fei-hypre/Makefile
  HEADERS =\
   cfei-hypre.h\
   cfei_hypre.h\
-@@ -212,9 +225,9 @@ libHYPRE_FEI.a: ${OBJS}
+@@ -212,9 +224,9 @@ libHYPRE_FEI.a: ${OBJS}
  	${AR} $@ ${OBJS}
  	${RANLIB} $@
  
@@ -38,12 +37,11 @@ Index: hypre/src/FEI_mv/femli/Makefile
 ===================================================================
 --- hypre.orig/src/FEI_mv/femli/Makefile
 +++ hypre/src/FEI_mv/femli/Makefile
-@@ -10,6 +10,17 @@
+@@ -10,6 +10,16 @@
  # $Revision$
  #EHEADER**********************************************************************
  
 +HYPRE_LIBS = \
-+  ../SuperLU/SRC/libHYPRE_superlu.so \
 +  ../../utilities/libHYPRE_utilities.so \
 +  ../../krylov/libHYPRE_krylov.so \
 +  ../../seq_mv/libHYPRE_seq_mv.so \
@@ -56,7 +54,7 @@ Index: hypre/src/FEI_mv/femli/Makefile
  
  include ../../config/Makefile.config
  
-@@ -157,9 +168,10 @@ libHYPRE_mli.a: ${OBJS}
+@@ -157,9 +167,10 @@ libHYPRE_mli.a: ${OBJS}
  	${AR} $@ ${OBJS}
  	${RANLIB} $@
  

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