[hypre] 04/04: refresh debian/patches
Drew Parsons
dparsons at moszumanska.debian.org
Wed Oct 18 11:15:25 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 08c4e6c8dc63f436b17958edbbcda165f092a857
Author: Drew Parsons <dparsons at debian.org>
Date: Wed Oct 18 19:08:28 2017 +0800
refresh debian/patches
---
debian/patches/complex.patch | 2 +-
debian/patches/configure.patch | 4 ++--
debian/patches/install.patch | 8 +++----
debian/patches/shlibs-interlink-sublibs.patch | 10 ++++-----
debian/patches/superlu_internal.patch | 32 ++-------------------------
debian/patches/test.patch | 2 +-
6 files changed, 15 insertions(+), 43 deletions(-)
diff --git a/debian/patches/complex.patch b/debian/patches/complex.patch
index a10cb58..e421188 100644
--- a/debian/patches/complex.patch
+++ b/debian/patches/complex.patch
@@ -27,7 +27,7 @@ Index: hypre/src/config/configure.in
===================================================================
--- hypre.orig/src/config/configure.in
+++ hypre/src/config/configure.in
-@@ -1259,6 +1259,12 @@ HYPRE_INSTALLDIR="${prefix}"
+@@ -1637,6 +1637,12 @@ HYPRE_INSTALLDIR="${prefix}"
HYPRE_LIBINSTALL="${libdir}"
HYPRE_INCINSTALL="${includedir}/hypre"
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index 6c19c6a..5097c26 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -11,7 +11,7 @@ Index: hypre/src/config/configure.in
dnl *********************************************************************
dnl * Initialize some variables
-@@ -161,19 +161,18 @@ hypre_lapack_lib_dir_old_style=no
+@@ -167,19 +167,18 @@ hypre_lapack_lib_dir_old_style=no
dnl *********************************************************************
dnl * Determine BUILD, HOST, and TARGET types
dnl *********************************************************************
@@ -36,7 +36,7 @@ Index: hypre/src/config/configure.in
fi
dnl *********************************************************************
-@@ -1258,7 +1257,7 @@ dnl * Set installation directories
+@@ -1636,7 +1635,7 @@ dnl * Set installation directories
dnl *********************************************************************
HYPRE_INSTALLDIR="${prefix}"
HYPRE_LIBINSTALL="${libdir}"
diff --git a/debian/patches/install.patch b/debian/patches/install.patch
index 72dce94..29f55ef 100644
--- a/debian/patches/install.patch
+++ b/debian/patches/install.patch
@@ -153,7 +153,7 @@ Index: hypre/src/parcsr_ls/Makefile
===================================================================
--- hypre.orig/src/parcsr_ls/Makefile
+++ hypre/src/parcsr_ls/Makefile
-@@ -140,7 +140,7 @@ all: libHYPRE_parcsr_ls${HYPRE_LIB_SUFFI
+@@ -142,7 +142,7 @@ all: libHYPRE_parcsr_ls${HYPRE_LIB_SUFFI
install: libHYPRE_parcsr_ls${HYPRE_LIB_SUFFIX}
cp -fR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
cp -fR $(srcdir)/_hypre_parcsr_ls.h $(HYPRE_INC_INSTALL)
@@ -179,7 +179,7 @@ Index: hypre/src/seq_mv/Makefile
===================================================================
--- hypre.orig/src/seq_mv/Makefile
+++ hypre/src/seq_mv/Makefile
-@@ -59,7 +59,7 @@ all: libHYPRE_seq_mv${HYPRE_LIB_SUFFIX}
+@@ -63,7 +63,7 @@ all: libHYPRE_seq_mv${HYPRE_LIB_SUFFIX}
install: libHYPRE_seq_mv${HYPRE_LIB_SUFFIX}
cp -fR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
cp -fR $(srcdir)/seq_mv.h $(HYPRE_INC_INSTALL)
@@ -244,7 +244,7 @@ Index: hypre/src/utilities/Makefile
===================================================================
--- hypre.orig/src/utilities/Makefile
+++ hypre/src/utilities/Makefile
-@@ -81,7 +81,7 @@ install: libHYPRE_utilities${HYPRE_LIB_S
+@@ -83,7 +83,7 @@ install: libHYPRE_utilities${HYPRE_LIB_S
cp -fR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
cp -fR $(srcdir)/_hypre_utilities.h $(HYPRE_INC_INSTALL)
cp -fR $(srcdir)/fortran*.h $(HYPRE_INC_INSTALL)
@@ -257,7 +257,7 @@ Index: hypre/src/Makefile
===================================================================
--- hypre.orig/src/Makefile
+++ hypre/src/Makefile
-@@ -187,23 +187,16 @@ checkpar:
+@@ -188,23 +188,16 @@ checkpar:
install: all
@ \
echo "Installing hypre ..."; \
diff --git a/debian/patches/shlibs-interlink-sublibs.patch b/debian/patches/shlibs-interlink-sublibs.patch
index 3b8ac7b..b91b4f0 100644
--- a/debian/patches/shlibs-interlink-sublibs.patch
+++ b/debian/patches/shlibs-interlink-sublibs.patch
@@ -342,7 +342,7 @@ Index: hypre/src/parcsr_ls/Makefile
HEADERS =\
HYPRE_parcsr_ls.h\
_hypre_parcsr_ls.h\
-@@ -158,9 +174,9 @@ libHYPRE_parcsr_ls.a: ${OBJS}
+@@ -160,9 +176,9 @@ libHYPRE_parcsr_ls.a: ${OBJS}
${AR} $@ ${OBJS}
${RANLIB} $@
@@ -386,12 +386,12 @@ 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}
+@@ -80,9 +80,9 @@ libHYPRE_seq_mv.a: ${OBJS} ${CUOBJS}
${AR} $@ ${OBJS}
${RANLIB} $@
--libHYPRE_seq_mv.so: ${OBJS}
-+libHYPRE_seq_mv.so: ${OBJS} ../utilities/libHYPRE_utilities.so
+-libHYPRE_seq_mv.so: ${OBJS} ${CUOBJS}
++libHYPRE_seq_mv.so: ${OBJS} ${CUOBJS} ../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}
@@ -518,7 +518,7 @@ Index: hypre/src/utilities/Makefile
===================================================================
--- hypre.orig/src/utilities/Makefile
+++ hypre/src/utilities/Makefile
-@@ -100,7 +100,7 @@ libHYPRE_utilities.a: ${OBJS}
+@@ -102,7 +102,7 @@ libHYPRE_utilities.a: ${OBJS}
libHYPRE_utilities.so: ${OBJS}
@echo "Building $@ ... "
diff --git a/debian/patches/superlu_internal.patch b/debian/patches/superlu_internal.patch
index 5ee8553..1a0ed61 100644
--- a/debian/patches/superlu_internal.patch
+++ b/debian/patches/superlu_internal.patch
@@ -44,21 +44,7 @@ Index: hypre/src/config/configure.in
===================================================================
--- hypre.orig/src/config/configure.in
+++ hypre/src/config/configure.in
-@@ -1045,13 +1045,6 @@ then
- HYPRE_FEI_SRC_DIR="$HYPRE_SRCDIR/FEI_mv"
- HYPRE_FEI_SUBDIRS="fei-hypre"
- HYPRE_FEI_HYPRE_FILES="$HYPRE_SRCDIR/FEI_mv/fei-hypre/*.o"
-- if test "$hypre_using_superlu" = "yes"
-- then
-- HYPRE_FEI_SUBDIRS="SuperLU $HYPRE_FEI_SUBDIRS"
-- HYPRE_FEI_SUPERLU_FILES="$HYPRE_SRCDIR/FEI_mv/SuperLU/SRC/*.o"
-- else
-- HYPRE_FEI_SUPERLU_FILES=
-- fi
- if test "$hypre_using_mli" = "yes"
- then
- HYPRE_FEI_SUBDIRS="femli $HYPRE_FEI_SUBDIRS"
-@@ -1059,6 +1052,13 @@ then
+@@ -1270,6 +1270,13 @@ then
else
HYPRE_FEI_FEMLI_FILES=
fi
@@ -76,21 +62,7 @@ Index: hypre/src/configure
===================================================================
--- hypre.orig/src/configure
+++ hypre/src/configure
-@@ -6731,13 +6731,6 @@ then
- HYPRE_FEI_SRC_DIR="$HYPRE_SRCDIR/FEI_mv"
- HYPRE_FEI_SUBDIRS="fei-hypre"
- HYPRE_FEI_HYPRE_FILES="$HYPRE_SRCDIR/FEI_mv/fei-hypre/*.o"
-- if test "$hypre_using_superlu" = "yes"
-- then
-- HYPRE_FEI_SUBDIRS="SuperLU $HYPRE_FEI_SUBDIRS"
-- HYPRE_FEI_SUPERLU_FILES="$HYPRE_SRCDIR/FEI_mv/SuperLU/SRC/*.o"
-- else
-- HYPRE_FEI_SUPERLU_FILES=
-- fi
- if test "$hypre_using_mli" = "yes"
- then
- HYPRE_FEI_SUBDIRS="femli $HYPRE_FEI_SUBDIRS"
-@@ -6745,6 +6738,13 @@ then
+@@ -7291,6 +7291,13 @@ then
else
HYPRE_FEI_FEMLI_FILES=
fi
diff --git a/debian/patches/test.patch b/debian/patches/test.patch
index 25e832f..7876f76 100644
--- a/debian/patches/test.patch
+++ b/debian/patches/test.patch
@@ -224,7 +224,7 @@ Index: hypre/src/test/Makefile
===================================================================
--- hypre.orig/src/test/Makefile
+++ hypre/src/test/Makefile
-@@ -44,7 +44,27 @@ BLASLIBFLAGS = ${BLASLIBDIRS} ${BLASLIBS
+@@ -46,7 +46,27 @@ BLASLIBFLAGS = ${BLASLIBDIRS} ${BLASLIBS
LIBFLAGS = ${LDFLAGS} ${LIBS}
LFLAGS =\
--
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