[hypre] 02/08: update superlu.patch to link in FEI shared libraries

Drew Parsons dparsons at moszumanska.debian.org
Tue Nov 1 08:47: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 212b2a7dbb262d9f7155d405045ee082e732c357
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Nov 1 12:06:42 2016 +0800

    update superlu.patch to link in FEI shared libraries
    
    i.e. use external superlu rather than internal
---
 debian/patches/superlu.patch | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/debian/patches/superlu.patch b/debian/patches/superlu.patch
index 58007ad..b87c0f2 100644
--- a/debian/patches/superlu.patch
+++ b/debian/patches/superlu.patch
@@ -1,17 +1,17 @@
-Index: hypre-2.10.0b/src/FEI_mv/femli/test/make.csh
+Index: hypre/src/FEI_mv/femli/test/make.csh
 ===================================================================
---- hypre-2.10.0b.orig/src/FEI_mv/femli/test/make.csh
-+++ hypre-2.10.0b/src/FEI_mv/femli/test/make.csh
+--- hypre.orig/src/FEI_mv/femli/test/make.csh
++++ hypre/src/FEI_mv/femli/test/make.csh
 @@ -1,4 +1,4 @@
  #!/bin/csh
  mpiCC -c -DHYPRE_TIMING -I../../../hypre/include -I.. -I../../.. driver.c
 -mpiCC -o driver driver.o -L../../../hypre/lib -L/usr/lib -lHYPRE -lHYPRE_superlu -lHYPRE_LSI -lg2c -lm
 +mpiCC -o driver driver.o -L../../../hypre/lib -L/usr/lib -lHYPRE -lsuperlu -lHYPRE_LSI -lg2c -lm
  
-Index: hypre-2.10.0b/src/parcsr_block_mv/Makefile
+Index: hypre/src/parcsr_block_mv/Makefile
 ===================================================================
---- hypre-2.10.0b.orig/src/parcsr_block_mv/Makefile
-+++ hypre-2.10.0b/src/parcsr_block_mv/Makefile
+--- hypre.orig/src/parcsr_block_mv/Makefile
++++ hypre/src/parcsr_block_mv/Makefile
 @@ -34,7 +34,7 @@ LFLAGS = \
        -lHYPRE_DistributedMatrixPilutSolver -lHYPRE_IJ_mv \
        -lHYPRE_parcsr_mv -lHYPRE_seq_mv -lHYPRE_DistributedMatrix \
@@ -21,3 +21,29 @@ Index: hypre-2.10.0b/src/parcsr_block_mv/Makefile
  
  HEADERS =\
   csr_block_matrix.h\
+Index: hypre/src/FEI_mv/fei-hypre/Makefile
+===================================================================
+--- hypre.orig/src/FEI_mv/fei-hypre/Makefile
++++ hypre/src/FEI_mv/fei-hypre/Makefile
+@@ -212,7 +212,7 @@ libHYPRE_FEI.a: ${OBJS}
+ 
+ libHYPRE_FEI.so: ${OBJS}
+ 	@echo  "Building $@ ... "
+-	${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++	${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} -lsuperlu ${SHARED_SET_SONAME}${SONAME}
+ 	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
+@@ -157,7 +157,7 @@ libHYPRE_mli.a: ${OBJS}
+ 
+ libHYPRE_mli.so: ${OBJS}
+ 	@echo  "Building $@ ... "
+-	${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME}
++	${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} -lsuperlu ${SHARED_SET_SONAME}${SONAME}
+ 	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