[hypre] 03/04: now uses external SuperLU (remove debian superlu_internal.patch)
Drew Parsons
dparsons at moszumanska.debian.org
Mon Nov 6 09:13:46 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository hypre.
commit 32e4a0ddd7e90c7cfddb9bf372e3c849cc1ed13c
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Nov 6 16:51:47 2017 +0800
now uses external SuperLU (remove debian superlu_internal.patch)
---
debian/changelog | 1 +
debian/patches/series | 1 -
debian/patches/superlu_internal.patch | 42 -----------------------------------
3 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8040f35..547fa6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ hypre (2.13.0-1exp1) UNRELEASED; urgency=medium
* New upstream version.
- new multigrid reduction (MGR) solver
- updates AMG Hybrid solver with BoomerAMG
+ - now uses external SuperLU (remove debian superlu_internal.patch)
-- Drew Parsons <dparsons at debian.org> Mon, 06 Nov 2017 16:38:54 +0800
diff --git a/debian/patches/series b/debian/patches/series
index de57e73..630ec1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,4 @@ complex.patch
shlibs-interlink-libHYPRE.so.patch
test.patch
lapack.patch
-superlu_internal.patch
shlibs-interlink-sublibs.patch
diff --git a/debian/patches/superlu_internal.patch b/debian/patches/superlu_internal.patch
deleted file mode 100644
index 3a9cb81..0000000
--- a/debian/patches/superlu_internal.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: hypre/src/FEI_mv/SuperLU/SRC/Makefile
-===================================================================
---- hypre.orig/src/FEI_mv/SuperLU/SRC/Makefile
-+++ hypre/src/FEI_mv/SuperLU/SRC/Makefile
-@@ -55,6 +55,9 @@ HEADERS =\
- slu_ddefs.h\
- slu_util.h\
- supermatrix.h
-+
-+SYSTEM_LIBS = ${BLASLIBDIRS} ${BLASLIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS} -lm
-+
- #######################################
-
- ### LAPACK
-@@ -153,13 +156,15 @@ FILES =\
-
- OBJS = ${FILES:.c=.o}
-
-+SONAME = libHYPRE_superlu-${HYPRE_RELEASE_VERSION}.so
-+
- all: libHYPRE_superlu${HYPRE_LIB_SUFFIX}
- cp -fp *.h $(HYPRE_BUILD_DIR)/include
- # cp -fp libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_superlu${HYPRE_LIB_SUFFIX}
-- cp -f *.h $(HYPRE_INC_INSTALL)
--# cp -f libHYPRE* $(HYPRE_LIB_INSTALL)
-+# cp -fR *.h $(HYPRE_INC_INSTALL)
-+ cp -fR libHYPRE* $(HYPRE_LIB_INSTALL)
- @echo " "
-
- clean:
-@@ -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} ${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