[hypre] 04/09: refresh debian patches
Drew Parsons
dparsons at moszumanska.debian.org
Fri Sep 29 06:41:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to tag experimental/2.11.2-1
in repository hypre.
commit 93714cfa6408aa6c2eec2599700c77970dbf2092
Author: Drew Parsons <dparsons at debian.org>
Date: Fri Sep 29 12:15:00 2017 +0800
refresh debian patches
patch to #include "hypre_lapack.h" is already applied upstream
---
debian/patches/blas.patch | 23 ++++--------
debian/patches/complex.patch | 2 +-
debian/patches/configure.patch | 4 +--
debian/patches/install.patch | 2 +-
debian/patches/lapack.patch | 15 --------
debian/patches/superlu_internal.patch | 68 +++--------------------------------
6 files changed, 15 insertions(+), 99 deletions(-)
diff --git a/debian/patches/blas.patch b/debian/patches/blas.patch
index 81c028a..a63bd60 100644
--- a/debian/patches/blas.patch
+++ b/debian/patches/blas.patch
@@ -1,24 +1,15 @@
-Index: hypre-2.11.0/src/config/hypre_blas_macros.m4
+Index: hypre/src/config/hypre_blas_macros.m4
===================================================================
---- hypre-2.11.0.orig/src/config/hypre_blas_macros.m4
-+++ hypre-2.11.0/src/config/hypre_blas_macros.m4
-@@ -67,7 +67,7 @@ AC_DEFUN([AC_HYPRE_FIND_BLAS],
- #***************************************************************
- hypre_save_LIBS="$LIBS"
- hypre_save_LDFLGS="$LDFLAGS"
-- LIBS="$LIBS -nodefaultlibs -L/usr/local/Cellar/gcc/5.3.0/lib/gcc/5/liblgfortran.a -lm"
-+# LIBS="$LIBS -nodefaultlibs -L/usr/local/Cellar/gcc/5.3.0/lib/gcc/5/liblgfortran.a -lm"
-
- #***************************************************************
- # Set possible BLAS library names
+--- hypre.orig/src/config/hypre_blas_macros.m4
++++ hypre/src/config/hypre_blas_macros.m4
@@ -77,8 +77,8 @@ AC_DEFUN([AC_HYPRE_FIND_BLAS],
#***************************************************************
# Set search paths for BLAS library
#***************************************************************
-- temp_FLAGS="-L/usr/local2/lib -L/usr/lib2 -L/lib -L/opt/intel/mkl70/lib/32"
-- LDFLAGS="-nodefaultlibs $temp_FLAGS $LDFLAGS"
-+# temp_FLAGS="-L/usr/local2/lib -L/usr/lib2 -L/lib -L/opt/intel/mkl70/lib/32"
-+# LDFLAGS="-nodefaultlibs $temp_FLAGS $LDFLAGS"
+- temp_FLAGS="-L/usr/lib -L/usr/local/lib -L/lib -L/opt/intel/mkl70/lib/32"
+- LDFLAGS="$temp_FLAGS $LDFLAGS"
++# temp_FLAGS="-L/usr/lib -L/usr/local/lib -L/lib -L/opt/intel/mkl70/lib/32"
++# LDFLAGS="$temp_FLAGS $LDFLAGS"
#***************************************************************
# Check for function dgemm in BLAS_LIB_NAMES
diff --git a/debian/patches/complex.patch b/debian/patches/complex.patch
index a7c1536..a10cb58 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
-@@ -1200,6 +1200,12 @@ HYPRE_INSTALLDIR="${prefix}"
+@@ -1259,6 +1259,12 @@ HYPRE_INSTALLDIR="${prefix}"
HYPRE_LIBINSTALL="${libdir}"
HYPRE_INCINSTALL="${includedir}/hypre"
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index de38740..6c19c6a 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
-@@ -157,19 +157,18 @@ hypre_lapack_lib_dir_old_style=no
+@@ -161,19 +161,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 *********************************************************************
-@@ -1199,7 +1198,7 @@ dnl * Set installation directories
+@@ -1258,7 +1257,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 9e38871..72dce94 100644
--- a/debian/patches/install.patch
+++ b/debian/patches/install.patch
@@ -257,7 +257,7 @@ Index: hypre/src/Makefile
===================================================================
--- hypre.orig/src/Makefile
+++ hypre/src/Makefile
-@@ -161,23 +161,16 @@ check:
+@@ -187,23 +187,16 @@ checkpar:
install: all
@ \
echo "Installing hypre ..."; \
diff --git a/debian/patches/lapack.patch b/debian/patches/lapack.patch
index ab36c4e..dc2a3d9 100644
--- a/debian/patches/lapack.patch
+++ b/debian/patches/lapack.patch
@@ -10,18 +10,3 @@ Index: hypre/src/FEI_mv/femli/Makefile
${MLI_INCLUDES}\
${CINCLUDES}
-Index: hypre/src/FEI_mv/femli/mli_utils.c
-===================================================================
---- hypre.orig/src/FEI_mv/femli/mli_utils.c
-+++ hypre/src/FEI_mv/femli/mli_utils.c
-@@ -27,7 +27,10 @@
- #include "mli_utils.h"
- #include "HYPRE_IJ_mv.h"
- #include "../fei-hypre/HYPRE_parcsr_fgmres.h"
-+
-+#ifdef HYPRE_USING_HYPRE_LAPACK
- #include "hypre_lapack.h"
-+#endif
-
- /*--------------------------------------------------------------------------
- * external function
diff --git a/debian/patches/superlu_internal.patch b/debian/patches/superlu_internal.patch
index d4d142d..5ee8553 100644
--- a/debian/patches/superlu_internal.patch
+++ b/debian/patches/superlu_internal.patch
@@ -40,71 +40,11 @@ Index: hypre/src/FEI_mv/SuperLU/SRC/Makefile
${OBJS}: ${HEADERS}
-Index: hypre/src/FEI_mv/SuperLU/SRC/dgsequ.c
-===================================================================
---- hypre.orig/src/FEI_mv/SuperLU/SRC/dgsequ.c
-+++ hypre/src/FEI_mv/SuperLU/SRC/dgsequ.c
-@@ -18,7 +18,10 @@
-
- #include <math.h>
- #include "slu_ddefs.h"
-+
-+#ifdef HYPRE_USING_HYPRE_LAPACK
- #include "hypre_lapack.h"
-+#endif
-
- void
- dgsequ(SuperMatrix *A, double *r, double *c, double *rowcnd,
-Index: hypre/src/FEI_mv/SuperLU/SRC/dgssvx.c
-===================================================================
---- hypre.orig/src/FEI_mv/SuperLU/SRC/dgssvx.c
-+++ hypre/src/FEI_mv/SuperLU/SRC/dgssvx.c
-@@ -13,7 +13,10 @@
-
-
- #include "slu_ddefs.h"
-+
-+#ifdef HYPRE_USING_HYPRE_LAPACK
- #include "hypre_lapack.h"
-+#endif
-
- void
- dgssvx(superlu_options_t *options, SuperMatrix *A, int *perm_c, int *perm_r,
-Index: hypre/src/FEI_mv/SuperLU/SRC/dlaqgs.c
-===================================================================
---- hypre.orig/src/FEI_mv/SuperLU/SRC/dlaqgs.c
-+++ hypre/src/FEI_mv/SuperLU/SRC/dlaqgs.c
-@@ -17,7 +17,10 @@
-
- #include <math.h>
- #include "slu_ddefs.h"
-+
-+#ifdef HYPRE_USING_HYPRE_LAPACK
- #include "hypre_lapack.h"
-+#endif
-
- void
- dlaqgs(SuperMatrix *A, double *r, double *c,
-Index: hypre/src/FEI_mv/SuperLU/SRC/dpivotgrowth.c
-===================================================================
---- hypre.orig/src/FEI_mv/SuperLU/SRC/dpivotgrowth.c
-+++ hypre/src/FEI_mv/SuperLU/SRC/dpivotgrowth.c
-@@ -13,7 +13,10 @@
-
- #include <math.h>
- #include "slu_ddefs.h"
-+
-+#ifdef HYPRE_USING_HYPRE_LAPACK
- #include "hypre_lapack.h"
-+#endif
-
- double
- dPivotGrowth(int ncols, SuperMatrix *A, int *perm_c,
Index: hypre/src/config/configure.in
===================================================================
--- hypre.orig/src/config/configure.in
+++ hypre/src/config/configure.in
-@@ -1012,13 +1012,6 @@ then
+@@ -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"
@@ -118,7 +58,7 @@ Index: hypre/src/config/configure.in
if test "$hypre_using_mli" = "yes"
then
HYPRE_FEI_SUBDIRS="femli $HYPRE_FEI_SUBDIRS"
-@@ -1026,6 +1019,13 @@ then
+@@ -1059,6 +1052,13 @@ then
else
HYPRE_FEI_FEMLI_FILES=
fi
@@ -136,7 +76,7 @@ Index: hypre/src/configure
===================================================================
--- hypre.orig/src/configure
+++ hypre/src/configure
-@@ -6679,13 +6679,6 @@ then
+@@ -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"
@@ -150,7 +90,7 @@ Index: hypre/src/configure
if test "$hypre_using_mli" = "yes"
then
HYPRE_FEI_SUBDIRS="femli $HYPRE_FEI_SUBDIRS"
-@@ -6693,6 +6686,13 @@ then
+@@ -6745,6 +6738,13 @@ then
else
HYPRE_FEI_FEMLI_FILES=
fi
--
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