[hypre] 06/08: activate test.patch
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 c69775b9f19fba2587d4e1edf749ede7190bf675
Author: Drew Parsons <dparsons at debian.org>
Date: Tue Nov 1 13:19:21 2016 +0800
activate test.patch
all shared sublibraries are installed together in HYPRE_LIB_INSTALL,
so use it in tests
---
debian/patches/series | 2 +-
debian/patches/test.patch | 190 ++++------------------------------------------
2 files changed, 15 insertions(+), 177 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index a98f025..9abb216 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
configure.patch
superlu.patch
install.patch
-#test.patch
#examples.patch
##cmake-install.patch
#config-for-petsc.patch
blas.patch
complex.patch
shlibs-interlink.patch
+test.patch
diff --git a/debian/patches/test.patch b/debian/patches/test.patch
index 86dbfa9..29b3348 100644
--- a/debian/patches/test.patch
+++ b/debian/patches/test.patch
@@ -1,7 +1,7 @@
-Index: hypre-2.10.0b/src/test/runtest.sh
+Index: hypre/src/test/runtest.sh
===================================================================
---- hypre-2.10.0b.orig/src/test/runtest.sh
-+++ hypre-2.10.0b/src/test/runtest.sh
+--- hypre.orig/src/test/runtest.sh
++++ hypre/src/test/runtest.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
@@ -318,7 +318,7 @@ Index: hypre-2.10.0b/src/test/runtest.sh
TestDirNames="$TestDirNames $DirPart"
case $DirPart in
TEST_examples)
-@@ -551,7 +551,7 @@ do
+@@ -552,7 +552,7 @@ do
for errfile in $( find $dir -name "*.err" )
do
if (egrep -f runtest.filters $errfile > /dev/null) ; then
@@ -327,17 +327,17 @@ Index: hypre-2.10.0b/src/test/runtest.sh
echo "This file contains the original copy of $errfile before filtering" > $original
cat $errfile >> $original
mv $errfile $errfile.tmp
-Index: hypre-2.10.0b/src/test/Makefile
+Index: hypre/src/test/Makefile
===================================================================
---- hypre-2.10.0b.orig/src/test/Makefile
-+++ hypre-2.10.0b/src/test/Makefile
-@@ -45,15 +45,32 @@ LIBFLAGS = ${LDFLAGS} ${LIBS}
- # LIBFLAGS = ${LDFLAGS} ${LIBS} ${FLIBS}
+--- hypre.orig/src/test/Makefile
++++ hypre/src/test/Makefile
+@@ -44,7 +44,27 @@ BLASLIBFLAGS = ${BLASLIBDIRS} ${BLASLIBS
+ LIBFLAGS = ${LDFLAGS} ${LIBS}
LFLAGS =\
- -L${HYPRE_BUILD_DIR}/lib\
-- -lHYPRE\
-+ -L${HYPRE_LIB_INSTALL} \
++ -Wl,--no-as-needed \
++ -L${HYPRE_LIB_INSTALL}\
+ -lHYPRE_utilities \
+ -lHYPRE_multivector \
+ -lHYPRE_krylov \
@@ -355,170 +355,8 @@ Index: hypre-2.10.0b/src/test/Makefile
+ -lHYPRE_Euclid \
+ -lHYPRE_ParaSails \
+ -lHYPRE_DistributedMatrixPilutSolver \
-+ -lHYPRE \
++ -lHYPRE_FEI \
++ -lHYPRE_mli \
+ -lHYPRE\
${MPILIBFLAGS}\
${LAPACKLIBFLAGS}\
- ${BLASLIBFLAGS}\
- ${LIBFLAGS}
-
- BABELLIBFLAGS =\
-- -L${HYPRE_BUILD_DIR}/lib\
-+ -L${HYPRE_LIB_INSTALL} \
- -lbHYPRE\
- -lbHYPREClient-C\
- -lbHYPREClient-F\
-@@ -160,11 +177,11 @@ distclean: clean
-
- zboxloop: zboxloop.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- struct: struct.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- fij_mv: fij_mv.f
- @echo "Building" $@ "... "
-@@ -196,105 +213,105 @@ fstruct_mv: fstruct_mv.f
-
- struct_for: fstruct_mv.o fstruct_ls.o struct_for.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o $@.o ${FFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- ex1_for: fstruct_mv.o fstruct_ls.o ex1_for.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o $@.o ${FFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- ex3_for: fstruct_mv.o fstruct_ls.o ex3_for.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o $@.o ${FFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- ex5_for: fij_mv.o fparcsr_mv.o fparcsr_ls.o ex5_for.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ fij_mv.o fparcsr_mv.o fparcsr_ls.o $@.o ${FFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ fij_mv.o fparcsr_mv.o fparcsr_ls.o $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- ex6_for: fstruct_mv.o fstruct_ls.o fsstruct_mv.o fsstruct_ls.o ex6_for.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o fsstruct_mv.o fsstruct_ls.o $@.o ${FFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o fsstruct_mv.o fsstruct_ls.o $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- ex7_for: fstruct_mv.o fstruct_ls.o fsstruct_mv.o fsstruct_ls.o ex7_for.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o fsstruct_mv.o fsstruct_ls.o $@.o ${FFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ fstruct_mv.o fstruct_ls.o fsstruct_mv.o fsstruct_ls.o $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- for_maxwell: fparcsr_mv.o fsstruct_mv.o fsstruct_ls.o for_maxwell.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ fparcsr_mv.o fsstruct_mv.o fsstruct_ls.o $@.o ${FFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ fparcsr_mv.o fsstruct_mv.o fsstruct_ls.o $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- sstruct: sstruct.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- maxwell_unscaled: maxwell_unscaled.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- sstruct_fac: sstruct_fac.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- hypre_set_precond: hypre_set_precond.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- test_ij: hypre_set_precond.o test_ij.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ hypre_set_precond.o $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ hypre_set_precond.o $@.o -Wl,--no-as-needed ${LFLAGS}
-
- ij: ij.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- ij_mv: ij_mv.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- new_ij: new_ij.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- fei: fei.o
- @echo "Building" $@ "... "
-- ${LINK_CXX} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CXX} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- f77_struct: f77_struct.o
- @echo "Building" $@ "... "
-- ${F77} -o $@ $@.o ${FFLAGS} ${LFLAGS}
-+ ${F77} -o $@ $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- f77_ij: f77_ij.o
- @echo "Building" $@ "... "
-- ${F77} -o $@ $@.o ${FFLAGS} ${LFLAGS}
-+ ${F77} -o $@ $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- f77_ij_mv: f77_ij_mv.o
- @echo "Building" $@ "... "
-- ${F77} -o $@ $@.o ${FFLAGS} ${LFLAGS}
-+ ${F77} -o $@ $@.o ${FFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- driver_commpkg: driver_commpkg.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- ams_driver: ams_driver.o
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
-
- cxx_ij: cxx_ij.o
- @echo "Building" $@ "... "
-- ${LINK_CXX} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CXX} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
- cxx_ij.o: cxx_ij.cxx
- cxx_ij.cxx: ij.c
- cp -fp ij.c cxx_ij.cxx
-
- cxx_sstruct: cxx_sstruct.o
- @echo "Building" $@ "... "
-- ${LINK_CXX} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CXX} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
- cxx_sstruct.o: cxx_sstruct.cxx
- cxx_sstruct.cxx: sstruct.c
- cp -fp sstruct.c cxx_sstruct.cxx
-
- cxx_struct: cxx_struct.o
- @echo "Building" $@ "... "
-- ${LINK_CXX} -o $@ $@.o ${LFLAGS}
-+ ${LINK_CXX} -o $@ $@.o -Wl,--no-as-needed ${LFLAGS}
- cxx_struct.o: cxx_struct.cxx
- cxx_struct.cxx: struct.c
- cp -fp struct.c cxx_struct.cxx
-@@ -304,8 +321,8 @@ cxx_struct.cxx: struct.c
- ##################################################################
- ${HYPRE_BABEL_DRIVER_EXECS}: ${HYPRE_BABEL_DRIVER_OBJS}
- @echo "Building" $@ "... "
-- ${LINK_CC} -o $@ $@.o ${BABELLIBFLAGS} ${LFLAGS}
-+ ${LINK_CC} -o $@ $@.o ${BABELLIBFLAGS} -Wl,--no-as-needed ${LFLAGS}
-
- ${HYPRE_BABEL_DRIVER_F77_EXECS}: ${HYPRE_BABEL_DRIVER_F77_OBJS}
- @echo "Building" $@ "... "
-- ${F77} -o $@ $@.o ${BABELLIBFLAGS} ${FFLAGS} ${LFLAGS}
-+ ${F77} -o $@ $@.o ${BABELLIBFLAGS} ${FFLAGS} -Wl,--no-as-needed ${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