[hypre] 01/02: clear out unused debian patches
Drew Parsons
dparsons at moszumanska.debian.org
Mon Nov 13 15:25:57 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 20687b623c1288ab56f92f14caa805958460b8d0
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Nov 13 23:18:00 2017 +0800
clear out unused debian patches
---
debian/patches/cmake-install.patch | 32 ---
debian/patches/cmake.patch | 45 ----
debian/patches/config-for-petsc.patch | 15 --
debian/patches/config-update-dir.patch | 19 --
debian/patches/examples.patch | 257 -------------------
debian/patches/fgmres-lib.patch | 183 --------------
debian/patches/flexgmres-to-parcsr_ls.patch | 42 ---
debian/patches/install-libs.patch | 379 ----------------------------
debian/patches/series | 3 -
9 files changed, 975 deletions(-)
diff --git a/debian/patches/cmake-install.patch b/debian/patches/cmake-install.patch
deleted file mode 100644
index e165806..0000000
--- a/debian/patches/cmake-install.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: hypre-2.10.0b/src/CMakeLists.txt
-===================================================================
---- hypre-2.10.0b.orig/src/CMakeLists.txt
-+++ hypre-2.10.0b/src/CMakeLists.txt
-@@ -8,6 +8,10 @@ set (HYPRE_TIME 00:00:00)
- set (HYPRE_BUGS hypre-support at llnl.gov)
- set (HYPRE_SRCDIR "${PROJECT_SOURCE_DIR}")
-
-+set(HYPRE_MAJOR_VERSION 2)
-+set(HYPRE_MINOR_VERSION 10)
-+set(HYPRE_PATCH_VERSION 0b)
-+
- if (${hypre_SOURCE_DIR} STREQUAL ${hypre_BINARY_DIR})
- message(FATAL_ERROR "In-place build not allowed! Please use a separate build directory. See the Users Manual or INSTALL file for details.")
- endif ()
-@@ -778,9 +782,13 @@ if (HYPRE_USING_FEI)
- endif ()
-
- add_library (HYPRE ${HYPRE_SOURCES} ${FEI_LIBS})
--
--install (TARGETS HYPRE DESTINATION lib)
--install (FILES ${HYPRE_HEADERS} DESTINATION include)
-+if (BUILD_SHARED_LIBS)
-+set_target_properties(HYPRE PROPERTIES
-+ VERSION ${HYPRE_MAJOR_VERSION}.${HYPRE_MINOR_VERSION}.${HYPRE_PATCH_VERSION}
-+ SOVERSION ${HYPRE_MAJOR_VERSION})
-+endif (BUILD_SHARED_LIBS)
-+install (TARGETS HYPRE DESTINATION ${INSTALL_LIB_DIR})
-+install (FILES ${HYPRE_HEADERS} DESTINATION include/hypre)
-
- # add_subdirectory (test EXCLUDE_FROM_ALL)
-
diff --git a/debian/patches/cmake.patch b/debian/patches/cmake.patch
deleted file mode 100644
index 4ad9cc7..0000000
--- a/debian/patches/cmake.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: hypre-2.9.1a/src/CMakeLists.txt
-===================================================================
---- hypre-2.9.1a.orig/src/CMakeLists.txt 2013-09-12 08:36:16.000000000 +0200
-+++ hypre-2.9.1a/src/CMakeLists.txt 2013-09-12 08:36:16.000000000 +0200
-@@ -772,7 +772,7 @@
- add_library (HYPRE ${HYPRE_SOURCES} ${FEI_LIBS})
-
- install (TARGETS HYPRE DESTINATION lib)
--install (FILES ${HYPRE_HEADERS} DESTINATION include)
-+install (FILES ${HYPRE_HEADERS} DESTINATION include/hypre)
-
- # add_subdirectory (test EXCLUDE_FROM_ALL)
-
-Index: hypre-2.9.1a/src/FEI_mv/SuperLU/CMakeLists.txt
-===================================================================
---- hypre-2.9.1a.orig/src/FEI_mv/SuperLU/CMakeLists.txt 2012-09-25 00:59:53.000000000 +0200
-+++ hypre-2.9.1a/src/FEI_mv/SuperLU/CMakeLists.txt 2013-09-12 08:40:05.000000000 +0200
-@@ -59,4 +59,5 @@
- set_target_properties(HYPRE_superlu PROPERTIES COMPILE_FLAGS "-fPIC")
- endif()
-
--install (FILES ${HYPRE_superlu_HEADERS} DESTINATION include)
-+install (TARGETS HYPRE_superlu DESTINATION lib)
-+install (FILES ${HYPRE_superlu_HEADERS} DESTINATION include/hypre)
-Index: hypre-2.9.1a/src/FEI_mv/fei-hypre/CMakeLists.txt
-===================================================================
---- hypre-2.9.1a.orig/src/FEI_mv/fei-hypre/CMakeLists.txt 2012-09-25 02:13:39.000000000 +0200
-+++ hypre-2.9.1a/src/FEI_mv/fei-hypre/CMakeLists.txt 2013-09-12 08:40:41.000000000 +0200
-@@ -66,4 +66,5 @@
- set_target_properties(HYPRE_fei PROPERTIES COMPILE_FLAGS "-fPIC")
- endif()
-
--install (FILES ${HYPRE_fei_HEADERS} DESTINATION include)
-+install (TARGETS HYPRE_fei DESTINATION lib)
-+install (FILES ${HYPRE_fei_HEADERS} DESTINATION include/hypre)
-Index: hypre-2.9.1a/src/FEI_mv/femli/CMakeLists.txt
-===================================================================
---- hypre-2.9.1a.orig/src/FEI_mv/femli/CMakeLists.txt 2012-09-25 00:59:54.000000000 +0200
-+++ hypre-2.9.1a/src/FEI_mv/femli/CMakeLists.txt 2013-09-12 08:49:00.000000000 +0200
-@@ -46,3 +46,5 @@
- if(BUILD_SHARED_LIBS)
- set_target_properties(HYPRE_mli PROPERTIES COMPILE_FLAGS "-fPIC")
- endif()
-+
-+install (TARGETS HYPRE_mli DESTINATION lib)
diff --git a/debian/patches/config-for-petsc.patch b/debian/patches/config-for-petsc.patch
deleted file mode 100644
index 087c6fa..0000000
--- a/debian/patches/config-for-petsc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: hypre-2.10.0b/src/lib/Makefile
-===================================================================
---- hypre-2.10.0b.orig/src/lib/Makefile
-+++ hypre-2.10.0b/src/lib/Makefile
-@@ -53,9 +53,7 @@ LIBS_HYPRE = ../utilities/libHYPRE_utili
- ../distributed_ls/Euclid/libHYPRE_Euclid.so \
- ../distributed_ls/ParaSails/libHYPRE_ParaSails.so \
- ../distributed_ls/pilut/libHYPRE_DistributedMatrixPilutSolver.so \
-- ../parcsr_ls/libHYPRE_parcsr_ls.so \
-- ../FEI_mv/femli/libHYPRE_mli.so \
-- ../FEI_mv/fei-hypre/libHYPRE_FEI.so
-+ ../parcsr_ls/libHYPRE_parcsr_ls.so
-
- SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so
- SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\
diff --git a/debian/patches/config-update-dir.patch b/debian/patches/config-update-dir.patch
deleted file mode 100644
index 87764f2..0000000
--- a/debian/patches/config-update-dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Change include paths so "aclocal -I ." works.
-
-Index: hypre/src/config/configure.in
-===================================================================
---- hypre.orig/src/config/configure.in
-+++ hypre/src/config/configure.in
-@@ -61,9 +61,9 @@
- m4_define([M4_HYPRE_BUGS], [hypre-support at llnl.gov])
- m4_define([M4_HYPRE_SRCDIR], [`pwd`])
-
--m4_include([config/hypre_blas_macros.m4])
--m4_include([config/hypre_lapack_macros.m4])
--m4_include([config/hypre_macros_misc.m4])
-+m4_include([hypre_blas_macros.m4])
-+m4_include([hypre_lapack_macros.m4])
-+m4_include([hypre_macros_misc.m4])
-
- AC_PREREQ(2.59)
- AC_REVISION($Id: configure.in,v 1.101 2011/11/14 22:36:27 falgout Exp $)
diff --git a/debian/patches/examples.patch b/debian/patches/examples.patch
deleted file mode 100644
index f32288b..0000000
--- a/debian/patches/examples.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-Index: hypre-2.10.0b/src/examples/Makefile
-===================================================================
---- hypre-2.10.0b.orig/src/examples/Makefile
-+++ hypre-2.10.0b/src/examples/Makefile
-@@ -11,7 +11,7 @@ HYPRE_DIR = ../hypre
- # Compiling and linking options
- ########################################################################
- COPTS = -g -Wall
--CINCLUDES = -I$(HYPRE_DIR)/include
-+CINCLUDES = -I${HYPRE_INC_INSTALL}
- CDEFS = -DHAVE_CONFIG_H -DHYPRE_TIMING
- CFLAGS = $(COPTS) $(CINCLUDES) $(CDEFS)
- FOPTS = -g
-@@ -27,7 +27,27 @@ F90FLAGS = $(FFLAGS) $(IF90FLAGS)
-
-
- LINKOPTS = $(COPTS)
--LIBS = -L$(HYPRE_DIR)/lib -lHYPRE -lm
-+LIBS = \
-+ -L${HYPRE_LIB_INSTALL} \
-+ -lHYPRE_utilities \
-+ -lHYPRE_multivector \
-+ -lHYPRE_krylov \
-+ -lHYPRE_struct_mv \
-+ -lHYPRE_struct_ls \
-+ -lHYPRE_sstruct_mv \
-+ -lHYPRE_sstruct_ls \
-+ -lHYPRE_seq_mv \
-+ -lHYPRE_parcsr_mv \
-+ -lHYPRE_parcsr_ls \
-+ -lHYPRE_parcsr_block_mv \
-+ -lHYPRE_DistributedMatrix \
-+ -lHYPRE_MatrixMatrix \
-+ -lHYPRE_IJ_mv \
-+ -lHYPRE_Euclid \
-+ -lHYPRE_ParaSails \
-+ -lHYPRE_DistributedMatrixPilutSolver \
-+ -lHYPRE \
-+ -lblas -llapack -lm
- LFLAGS = $(LINKOPTS) $(LIBS) -lstdc++
- LFLAGS_B =\
- -L${HYPRE_DIR}/lib\
-@@ -37,7 +57,7 @@ LFLAGS_B =\
- -lbHYPRE\
- -lsidl -ldl -lxml2
- LFLAGS77 = $(LFLAGS)
--LFLAGS90 =
-+LFLAGS90 = $(LFLAGS)
-
- ########################################################################
- # Rules for compiling the source files
-@@ -47,7 +67,7 @@ LFLAGS90 =
- .c.o:
- $(CC) $(CFLAGS) -c $<
- .f.o:
-- $(F77) $(FFLAGS) -c $<
-+ $(F90) $(FFLAGS) -c $<
- .cxx.o:
- $(CXX) $(CXXFLAGS) -c $<
-
-@@ -65,9 +85,10 @@ LFLAGS90 =
- ########################################################################
- # List of all programs to be compiled
- ########################################################################
--ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex10 ex11 ex12 ex12f \
-+ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex11 ex12 ex12f \
- ex13 ex14 ex15 ex16
- BIGINTPROGS = ex5big ex15big
-+FEIPROGS= ex10
- BABELPROGS = ex5b ex5b77 ex5bxx ex6b ex6b77
- # ... ex5bp and ex5b90 are not in BABELPROGS because they require a
- # software environment which many people haven't set up.
-@@ -89,59 +110,61 @@ maxdim: $(MAXDIMPROGS)
-
- complex: $(COMPLEXPROGS)
-
-+fei: $(FEIPROGS)
-+
- ########################################################################
- # Example 1
- ########################################################################
- ex1: ex1.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 2
- ########################################################################
- ex2: ex2.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 3
- ########################################################################
- ex3: ex3.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 4
- ########################################################################
- ex4: ex4.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 5
- ########################################################################
- ex5: ex5.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 5 with 64-bit integers
- ########################################################################
- ex5big: ex5big.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 5 Fortran 77
- ########################################################################
- ex5f: ex5f.o
-- $(F77) -o $@ $^ $(LFLAGS77)
-+ $(F90) -o $@ $^ $(LFLAGS90)
-
- ########################################################################
- # Example 5 Babel C
- ########################################################################
- ex5b: ex5b.o
-- $(CC) -o $@ $^ $(LFLAGS_B) $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS_B) $(LFLAGS)
-
- ########################################################################
- # Example 5 Babel Fortran 77
- ########################################################################
- ex5b77: ex5b77.o
-- $(F77) -o $@ $^ $(LFLAGS_B) $(LFLAGS)
-+ $(F90) -o $@ $^ $(LFLAGS_B) $(LFLAGS90)
-
- ########################################################################
- # Example 5 Babel Fortran 90
-@@ -153,97 +176,97 @@ ex5b90: ex5b90.o
- # Example 5 Babel C++
- ########################################################################
- ex5bxx: ex5bxx.o
-- $(CXX) -o $@ $^ $(LFLAGS_B) $(LFLAGS)
-+ $(CXX) -o $@ $^ -Wl,--no-as-needed $(LFLAGS_B) $(LFLAGS)
-
- ########################################################################
- # Example 6
- ########################################################################
- ex6: ex6.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 6 Babel C
- ########################################################################
- ex6b: ex6b.o
-- $(CC) -o $@ $^ $(LFLAGS_B) $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS_B) $(LFLAGS)
-
- ########################################################################
- # Example 6 Babel Fortran 77
- ########################################################################
- ex6b77: ex6b77.o
-- $(F77) -o $@ $^ $(LFLAGS_B) $(LFLAGS)
-+ $(F90) -o $@ $^ $(LFLAGS_B) $(LFLAGS90)
-
- ########################################################################
- # Example 7
- ########################################################################
- ex7: ex7.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 8
- ########################################################################
- ex8: ex8.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 9
- ########################################################################
- ex9: ex9.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 10
- ########################################################################
- ex10: ex10.o
-- $(CXX) -o $@ $^ $(LFLAGS)
-+ $(CXX) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 11
- ########################################################################
- ex11: ex11.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 12
- ########################################################################
- ex12: ex12.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 12 Fortran 77
- ########################################################################
- ex12f: ex12f.o
-- $(F77) -o $@ $^ $(LFLAGS77)
-+ $(F90) -o $@ $^ $(LFLAGS) $(LFLAGS90)
-
- ########################################################################
- # Example 13
- ########################################################################
- ex13: ex13.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 14
- ########################################################################
- ex14: ex14.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 15
- ########################################################################
- ex15: ex15.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 15 with 64-bit integers
- ########################################################################
- ex15big: ex15big.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 16
- ########################################################################
- ex16: ex16.o
-- $(CC) -o $@ $^ $(LFLAGS)
-+ $(CC) -o $@ $^ -Wl,--no-as-needed $(LFLAGS)
-
- ########################################################################
- # Example 17
diff --git a/debian/patches/fgmres-lib.patch b/debian/patches/fgmres-lib.patch
deleted file mode 100644
index 3cef58e..0000000
--- a/debian/patches/fgmres-lib.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Add libHYPRE_FEI_fgmres.[a|so] to resolve a circular dependency:
-libHYPRE_FEI with fgmres.c depends on libHYPRE_mli.so which links with
-symbols in fgmres.c . (Resolves issue 182.)
-
-Index: hypre-2.9.1a/src/config/configure.in
-===================================================================
---- hypre-2.9.1a.orig/src/config/configure.in 2013-09-12 17:33:00.000000000 +0200
-+++ hypre-2.9.1a/src/config/configure.in 2013-09-12 17:33:00.000000000 +0200
-@@ -914,7 +914,7 @@
- if test "$hypre_using_fei" = "yes"
- then
- HYPRE_FEI_SRC_DIR="$HYPRE_SRCDIR/FEI_mv"
-- HYPRE_FEI_SUBDIRS="femli fei-hypre"
-+ HYPRE_FEI_SUBDIRS="fgmres femli fei-hypre"
- HYPRE_FEI_HYPRE_FILES="$HYPRE_SRCDIR/FEI_mv/fei-hypre/*.o"
- HYPRE_FEI_FEMLI_FILES="$HYPRE_SRCDIR/FEI_mv/femli/*.o"
- if test "$hypre_using_superlu" = "yes"
-Index: hypre-2.9.1a/src/FEI_mv/fei-hypre/Makefile
-===================================================================
---- hypre-2.9.1a.orig/src/FEI_mv/fei-hypre/Makefile 2013-09-12 17:33:00.000000000 +0200
-+++ hypre-2.9.1a/src/FEI_mv/fei-hypre/Makefile 2013-09-12 17:33:00.000000000 +0200
-@@ -113,7 +113,6 @@
- HYPRE_parcsr_TFQmr.c\
- HYPRE_parcsr_bicgs.c\
- HYPRE_parcsr_bicgstabl.c\
-- HYPRE_parcsr_fgmres.c\
- HYPRE_parcsr_lsicg.c\
- HYPRE_parcsr_symqmr.c\
- HYPRE_parcsr_maxwell.c\
-@@ -121,11 +120,12 @@
- TFQmr.c\
- bicgs.c\
- bicgstabl.c\
-- fgmres.c\
- hypre_lsi_amge.c\
- hypre_lsi_ddamg.c\
- hypre_lsi_misc.c\
- lsicg.c
-+# HYPRE_parcsr_fgmres.c
-+# fgmres.c
-
- FILESCXX = \
- FEI_HYPRE_Impl.cxx\
-Index: hypre-2.9.1a/src/FEI_mv/fgmres/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ hypre-2.9.1a/src/FEI_mv/fgmres/Makefile 2013-09-12 17:33:00.000000000 +0200
-@@ -0,0 +1,135 @@
-+#BHEADER**********************************************************************
-+# Copyright (c) 2006 The Regents of the University of California.
-+# Produced at the Lawrence Livermore National Laboratory.
-+# Written by the HYPRE team. UCRL-CODE-222953.
-+# All rights reserved.
-+#
-+# This file is part of HYPRE (see http://www.llnl.gov/CASC/hypre/).
-+# Please see the COPYRIGHT_and_LICENSE file for the copyright notice,
-+# disclaimer, contact information and the GNU Lesser General Public License.
-+#
-+# HYPRE is free software; you can redistribute it and/or modify it under the
-+# terms of the GNU General Public License (as published by the Free Software
-+# Foundation) version 2.1 dated February 1999.
-+#
-+# HYPRE is distributed in the hope that it will be useful, but WITHOUT ANY
-+# WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS
-+# FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU General
-+# Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# along with this program; if not, write to the Free Software Foundation,
-+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+#
-+# $Revision: 2.17 $
-+#EHEADER**********************************************************************
-+
-+# why do we create this variable, asked by Charles
-+HYPRE_LIB_SUFFIX = .a
-+
-+include ../../config/Makefile.config
-+
-+BASE_DIR = ${HYPRE_FEI_BASE_DIR}
-+
-+SUPERLU_INCLUDE = -I$(srcdir)/../SuperLU
-+SUPERLU_LIB = -L$(srcdir)/../SuperLU
-+
-+CINCLUDES=${INCLUDES} ${MPIINCLUDE} -I../ml/src/Include
-+CXXINCLUDES=${INCLUDES} ${MPIINCLUDE} -I../ml/src/Include
-+CDEFS = -DHAVE_SUPERLU -DBOOL_NOT_SUPPORTED
-+CXXDEFS = -DHAVE_SUPERLU -DBOOL_NOT_SUPPORTED -DMPICH_SKIP_MPICXX
-+
-+C_COMPILE_FLAGS = \
-+ ${CDEFS}\
-+ -I../..\
-+ -I$(BASE_DIR)\
-+ -I$(srcdir)\
-+ -I$(srcdir)/../..\
-+ -I$(srcdir)/../../IJ_mv\
-+ -I$(srcdir)/../../utilities\
-+ -I$(srcdir)/../../multivector\
-+ -I$(srcdir)/../../krylov\
-+ -I$(srcdir)/../../parcsr_mv\
-+ -I$(srcdir)/../../parcsr_ls\
-+ -I$(srcdir)/../../seq_mv\
-+ -I$(srcdir)/../../distributed_matrix\
-+ -I$(srcdir)/../../distributed_ls\
-+ -I$(srcdir)/../fei-base\
-+ ${SUPERLU_INCLUDE}\
-+ ${CINCLUDES}
-+
-+CXX_COMPILE_FLAGS = \
-+ ${CXXDEFS}\
-+ -I../..\
-+ -I$(BASE_DIR)\
-+ -I$(srcdir)/../..\
-+ -I$(srcdir)/../../IJ_mv\
-+ -I$(srcdir)/../../utilities\
-+ -I$(srcdir)/../../multivector\
-+ -I$(srcdir)/../../krylov\
-+ -I$(srcdir)/../../parcsr_mv\
-+ -I$(srcdir)/../../parcsr_ls\
-+ -I$(srcdir)/../../seq_mv\
-+ -I$(srcdir)/../../distributed_matrix\
-+ -I$(srcdir)/../../distributed_ls\
-+ -I$(srcdir)/../femli\
-+ -I$(srcdir)/../fei-base\
-+ ${SUPERLU_INCLUDE}\
-+ ${CXXINCLUDES}
-+
-+HYPRE_LIBS = \
-+ ../../utilities/libHYPRE_utilities.so \
-+ ../../parcsr_ls/libHYPRE_parcsr_ls.so
-+# ../../krylov/libHYPRE_krylov.so
-+# ../../seq_mv/libHYPRE_seq_mv.so
-+# ../../parcsr_mv/libHYPRE_parcsr_mv.so
-+# ../../IJ_mv/libHYPRE_IJ_mv.so
-+
-+SYSTEM_LIBS = -lm
-+
-+HEADERS =
-+
-+FILESC = \
-+ ../fei-hypre/HYPRE_parcsr_fgmres.c\
-+ ../fei-hypre/fgmres.c
-+
-+FILESCXX =
-+
-+OBJSC = ${FILESC:.c=.o}
-+OBJSCXX = ${FILESCXX:.cxx=.o}
-+OBJS = ${OBJSC} ${OBJSCXX}
-+
-+##################################################################
-+# Targets
-+##################################################################
-+
-+all: libHYPRE_FEI_fgmres${HYPRE_LIB_SUFFIX}
-+ cp -fpd libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+
-+install: libHYPRE_FEI_fgmres${HYPRE_LIB_SUFFIX}
-+ cp -fpd libHYPRE* $(HYPRE_LIB_INSTALL)
-+ @echo ""
-+
-+clean:
-+ rm -rf *.o libHYPRE*
-+ rm -rf pchdir tca.map *inslog*
-+
-+distclean: clean
-+
-+##################################################################
-+# Rules
-+##################################################################
-+libHYPRE_FEI_fgmres.a: ${OBJS}
-+ @echo "Building $@ ... "
-+ mv -f *.o ../fei-hypre/
-+ ${AR} $@ ${OBJS}
-+ ${RANLIB} $@
-+
-+libHYPRE_FEI_fgmres.so: ${OBJS} ${HYPRE_LIBS}
-+ @echo "Building $@ ... "
-+ mv -f *.o ../fei-hypre/
-+ ${BUILD_CC_SHARED} $^ ${SYSTEM_LIBS} -o libHYPRE_FEI_fgmres-2.8.0b.so -Wl,-soname,libHYPRE_FEI_fgmres-2.8.0b.so \
-+ -Wl,-z,defs
-+ ln -s libHYPRE_FEI_fgmres-2.8.0b.so $@
-+
-+${OBJS}: ${HEADERS}
diff --git a/debian/patches/flexgmres-to-parcsr_ls.patch b/debian/patches/flexgmres-to-parcsr_ls.patch
deleted file mode 100644
index e16c774..0000000
--- a/debian/patches/flexgmres-to-parcsr_ls.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Move (HYPRE_)flexgmres.c from krylov to parcsr_ls to resolve another
-circular dependency between those two libraries.
-
-Index: hypre-2.9.1a/src/krylov/Makefile
-===================================================================
---- hypre-2.9.1a.orig/src/krylov/Makefile 2013-09-12 17:32:50.000000000 +0200
-+++ hypre-2.9.1a/src/krylov/Makefile 2013-09-12 17:32:50.000000000 +0200
-@@ -39,17 +39,17 @@
- bicgstab.c\
- cgnr.c\
- gmres.c\
-- flexgmres.c\
- lgmres.c\
- HYPRE_bicgstab.c\
- HYPRE_cgnr.c\
- HYPRE_gmres.c\
- HYPRE_lgmres.c\
-- HYPRE_flexgmres.c\
- HYPRE_pcg.c\
- pcg.c\
- HYPRE_lobpcg.c\
- lobpcg.c
-+# flexgmres.c
-+# HYPRE_flexgmres.c
-
- OBJS = ${FILES:.c=.o}
-
-Index: hypre-2.9.1a/src/parcsr_ls/Makefile
-===================================================================
---- hypre-2.9.1a.orig/src/parcsr_ls/Makefile 2013-09-12 17:32:50.000000000 +0200
-+++ hypre-2.9.1a/src/parcsr_ls/Makefile 2013-09-12 17:32:50.000000000 +0200
-@@ -120,7 +120,9 @@
- block_tridiag.c\
- ams.c\
- ads.c\
-- ame.c
-+ ame.c\
-+ flexgmres.c\
-+ HYPRE_flexgmres.c
-
- OBJS = ${FILES:.c=.o}
-
diff --git a/debian/patches/install-libs.patch b/debian/patches/install-libs.patch
deleted file mode 100644
index 98a2715..0000000
--- a/debian/patches/install-libs.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-Remove comments so all libraries install.
-
-Index: hypre/src/FEI_mv/fei-hypre/Makefile
-===================================================================
---- hypre.orig/src/FEI_mv/fei-hypre/Makefile
-+++ hypre/src/FEI_mv/fei-hypre/Makefile
-@@ -182,7 +182,7 @@
- cp -fpPR $(BASE_DIR)/base/Lookup.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(BASE_DIR)/base/LinearSystemCore.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(BASE_DIR)/fei_defs.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_FEI${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/cfei-hypre.h $(HYPRE_INC_INSTALL)
-@@ -195,7 +195,7 @@
- cp -fpPR $(BASE_DIR)/base/Lookup.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(BASE_DIR)/base/LinearSystemCore.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(BASE_DIR)/fei_defs.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
- @echo ""
-
- clean:
-Index: hypre/src/FEI_mv/femli/lib/Makefile
-===================================================================
---- hypre.orig/src/FEI_mv/femli/lib/Makefile
-+++ hypre/src/FEI_mv/femli/lib/Makefile
-@@ -145,10 +145,10 @@
- ##################################################################
-
- all: libHYPRE_mli${HYPRE_LIB_SUFFIX}
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_mli${HYPRE_LIB_SUFFIX}
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
- @echo " "
-
- clean:
-Index: hypre/src/IJ_mv/Makefile
-===================================================================
---- hypre.orig/src/IJ_mv/Makefile
-+++ hypre/src/IJ_mv/Makefile
-@@ -69,12 +69,12 @@
- all: libHYPRE_IJ_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_IJ_mv.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_IJ_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_IJ_mv.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/distributed_ls/Euclid/Makefile
-===================================================================
---- hypre.orig/src/distributed_ls/Euclid/Makefile
-+++ hypre/src/distributed_ls/Euclid/Makefile
-@@ -105,10 +105,10 @@
- ##################################################################
-
- all: libHYPRE_Euclid${HYPRE_LIB_SUFFIX}
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_Euclid${HYPRE_LIB_SUFFIX}
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/distributed_ls/ParaSails/Makefile
-===================================================================
---- hypre.orig/src/distributed_ls/ParaSails/Makefile
-+++ hypre/src/distributed_ls/ParaSails/Makefile
-@@ -71,10 +71,10 @@
- ##################################################################
-
- all: libHYPRE_ParaSails${HYPRE_LIB_SUFFIX}
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_ParaSails${HYPRE_LIB_SUFFIX}
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/distributed_ls/pilut/Makefile
-===================================================================
---- hypre.orig/src/distributed_ls/pilut/Makefile
-+++ hypre/src/distributed_ls/pilut/Makefile
-@@ -63,11 +63,11 @@
-
- all: libHYPRE_DistributedMatrixPilutSolver${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_DistributedMatrixPilutSolver${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/distributed_matrix/Makefile
-===================================================================
---- hypre.orig/src/distributed_matrix/Makefile
-+++ hypre/src/distributed_matrix/Makefile
-@@ -50,11 +50,11 @@
-
- all: libHYPRE_DistributedMatrix${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/distributed_matrix.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_DistributedMatrix${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/distributed_matrix.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/krylov/Makefile
-===================================================================
---- hypre.orig/src/krylov/Makefile
-+++ hypre/src/krylov/Makefile
-@@ -67,13 +67,13 @@
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/krylov.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/lobpcg.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: all
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/krylov.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/lobpcg.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/matrix_matrix/Makefile
-===================================================================
---- hypre.orig/src/matrix_matrix/Makefile
-+++ hypre/src/matrix_matrix/Makefile
-@@ -49,11 +49,11 @@
-
- all: libHYPRE_MatrixMatrix${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_MatrixMatrix${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o lib*
-Index: hypre/src/multivector/Makefile
-===================================================================
---- hypre.orig/src/multivector/Makefile
-+++ hypre/src/multivector/Makefile
-@@ -39,11 +39,11 @@
-
- all: libHYPRE_multivector${HYPRE_LIB_SUFFIX}
- cp -fpPR *.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_multivector${HYPRE_LIB_SUFFIX}
- cp -fpPR *.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/parcsr_block_mv/Makefile
-===================================================================
---- hypre.orig/src/parcsr_block_mv/Makefile
-+++ hypre/src/parcsr_block_mv/Makefile
-@@ -75,7 +75,7 @@
- all: libHYPRE_parcsr_block_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/par_csr_block_matrix.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/csr_block_matrix.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE_* $(HYPRE_BUILD_DIR)/lib/.
-+ cp -fpPR libHYPRE_* $(HYPRE_BUILD_DIR)/lib/.
-
- driver: driver.o libHYPRE_parcsr_block_mv${HYPRE_LIB_SUFFIX}
- @echo "Linking" $@ "... "
-@@ -104,7 +104,7 @@
- install: libHYPRE_parcsr_block_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/par_csr_block_matrix.h $(HYPRE_INC_INSTALL)/.
- cp -fpPR $(srcdir)/csr_block_matrix.h $(HYPRE_INC_INSTALL)/.
--# cp -fpPR libHYPRE_* $(HYPRE_LIB_INSTALL)/.
-+ cp -fpPR libHYPRE_* $(HYPRE_LIB_INSTALL)/.
-
- clean:
- rm -rf *.o libHYPRE_*
-Index: hypre/src/parcsr_ls/Makefile
-===================================================================
---- hypre.orig/src/parcsr_ls/Makefile
-+++ hypre/src/parcsr_ls/Makefile
-@@ -155,12 +155,12 @@
- all: libHYPRE_parcsr_ls${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_parcsr_ls.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_parcsr_ls${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_parcsr_ls.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/parcsr_mv/Makefile
-===================================================================
---- hypre.orig/src/parcsr_mv/Makefile
-+++ hypre/src/parcsr_mv/Makefile
-@@ -85,7 +85,7 @@
- all: libHYPRE_parcsr_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_parcsr_mv.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- driver: driver.o libHYPRE_parcsr_mv${HYPRE_LIB_SUFFIX}
- @echo "Linking" $@ "... "
-@@ -114,7 +114,7 @@
- install: libHYPRE_parcsr_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_parcsr_mv.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/seq_ls/pamg/Makefile
-===================================================================
---- hypre.orig/src/seq_ls/pamg/Makefile
-+++ hypre/src/seq_ls/pamg/Makefile
-@@ -90,8 +90,10 @@
- ##################################################################
-
- lib: libHYPRE_amg_ls${HYPRE_LIB_SUFFIX}
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- all: libHYPRE_amg_ls${HYPRE_LIB_SUFFIX} driver
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- install: all
-
-Index: hypre/src/seq_mv/Makefile
-===================================================================
---- hypre.orig/src/seq_mv/Makefile
-+++ hypre/src/seq_mv/Makefile
-@@ -55,12 +55,12 @@
- all: libHYPRE_seq_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/seq_mv.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_seq_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/seq_mv.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/sstruct_ls/Makefile
-===================================================================
---- hypre.orig/src/sstruct_ls/Makefile
-+++ hypre/src/sstruct_ls/Makefile
-@@ -133,12 +133,12 @@
- all: libHYPRE_sstruct_ls${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_sstruct_ls.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_sstruct_ls${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_sstruct_ls.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/sstruct_mv/Makefile
-===================================================================
---- hypre.orig/src/sstruct_mv/Makefile
-+++ hypre/src/sstruct_mv/Makefile
-@@ -78,12 +78,12 @@
- all: libHYPRE_sstruct_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_sstruct_mv.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_sstruct_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_sstruct_mv.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/struct_ls/Makefile
-===================================================================
---- hypre.orig/src/struct_ls/Makefile
-+++ hypre/src/struct_ls/Makefile
-@@ -119,12 +119,12 @@
- all: libHYPRE_struct_ls${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_struct_ls.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_struct_ls${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_struct_ls.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/struct_mv/Makefile
-===================================================================
---- hypre.orig/src/struct_mv/Makefile
-+++ hypre/src/struct_mv/Makefile
-@@ -82,12 +82,12 @@
- all: libHYPRE_struct_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_struct_mv.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_struct_mv${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_struct_mv.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE*
-Index: hypre/src/utilities/Makefile
-===================================================================
---- hypre.orig/src/utilities/Makefile
-+++ hypre/src/utilities/Makefile
-@@ -73,13 +73,13 @@
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/_hypre_utilities.h $(HYPRE_BUILD_DIR)/include
- cp -fpPR $(srcdir)/fortran*.h $(HYPRE_BUILD_DIR)/include
--# cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-+ cp -fpPR libHYPRE* $(HYPRE_BUILD_DIR)/lib
-
- install: libHYPRE_utilities${HYPRE_LIB_SUFFIX}
- cp -fpPR $(srcdir)/HYPRE_*.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/_hypre_utilities.h $(HYPRE_INC_INSTALL)
- cp -fpPR $(srcdir)/fortran*.h $(HYPRE_INC_INSTALL)
--# cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-+ cp -fpPR libHYPRE* $(HYPRE_LIB_INSTALL)
-
- clean:
- rm -f *.o libHYPRE* f2c.h *blas.h *lapack.h
diff --git a/debian/patches/series b/debian/patches/series
index a1af420..be3c300 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
pilut_blas_mangle.patch
configure.patch
install.patch
-#examples.patch
-##cmake-install.patch
-#config-for-petsc.patch
blas.patch
complex.patch
shlibs-interlink-libHYPRE.so.patch
--
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