debian/0000775000000000000000000000000012253377462007203 5ustar debian/rules0000775000000000000000000001137511674362755010277 0ustar #!/usr/bin/make -f # Made with the aid of debmake, by Christoph Lameter, # based on the sample debian/rules file for GNU hello by Ian Jackson. package=hypre # This tells us which MPI implementation is in use HYPRE_MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g) # Files removed by the clean target KEEP_FILES= \ src/FEI_mv/DSuperLU/SRC/dmemory.c.orig \ src/FEI_mv/DSuperLU/SRC/memory.c.orig \ src/babel-runtime/Makefile.in \ src/babel-runtime/aclocal.m4 \ src/babel-runtime/bin/Makefile.in \ src/babel-runtime/config/Makefile.in \ src/babel-runtime/config/config.guess \ src/babel-runtime/config/config.sub \ src/babel-runtime/config/ltmain.sh \ src/babel-runtime/java/Makefile.in \ src/babel-runtime/m4/Makefile.in \ src/babel-runtime/m4/libtool.m4 \ src/babel-runtime/m4/ltdl.m4 \ src/babel-runtime/sidl/Makefile.in \ src/babel-runtime/sidl/ltdl.c \ src/babel-runtime/sidl/ltdl.h \ src/babel-runtime/sidlx/Makefile.in \ src/config/Makefile.config \ src/config/config.guess \ src/config/config.sub \ src/configure build: build-arch build-arch: stamp-build-arch stamp-build-arch: patch dh_testdir if [ ! -e src/parcsr_ls/flexgmres.c ]; then \ ln -s ../krylov/HYPRE_flexgmres.c ../krylov/flexgmres.c src/parcsr_ls/; \ fi if [ ! -e src/configure.keep ]; then \ for keepfile in $(KEEP_FILES); do \ mv $$keepfile $$keepfile.keep; \ done; \ fi rm -f src/configure (cd src/config && aclocal -I .) (cd src && autoconf -I config config/configure.in > configure) chmod +x src/configure cp -f /usr/share/automake*/config.* src/config/ (cd src/babel-runtime && libtoolize) cp -f src/babel-runtime/libltdl/ltdl.* src/babel-runtime/sidl/ rm -f src/babel-runtime/config/config.* (cd src/babel-runtime && aclocal -I m4) (cd src/babel-runtime && automake -a) (cd src && ./configure --enable-shared --without-superlu \ --with-blas-libs="blas" --with-blas-lib-dirs="/usr/lib" \ --with-lapack-libs="lapack" --with-lapack-lib-dirs="/usr/lib") $(MAKE) -C src # Remove PIC object files # rm -f `find . -name \*.o -print` # (cd src && ./configure --without-superlu \ # --with-blas-libs="blas-3" --with-blas-lib-dirs="/usr/lib" \ # --with-lapack-libs="lapack-3" --with-lapack-lib-dirs="/usr/lib") # $(MAKE) -C src touch $@ build-indep: build-arch clean: dh_testdir # Move these aside to avoid stomping on them during the clean process if [ ! -e src/configure.keep ]; then \ for keepfile in $(KEEP_FILES); do \ mv $$keepfile $$keepfile.keep; \ done; \ fi if [ -e src/Makefile ]; then \ touch src/config/Makefile.config; \ $(MAKE) -C src clean; fi rm -f stamp-configure stamp-build-arch stamp-install rm -f src/config/aclocal.m4 src/configure src/config/config.guess \ src/config/config.sub src/config/Makefile.config rm -f src/babel-runtime/Makefile.in src/babel-runtime/aclocal.m4 \ src/babel-runtime/bin/Makefile.in src/babel-runtime/config/Makefile.in \ src/babel-runtime/config/config.guess src/babel-runtime/config/config.sub \ src/babel-runtime/config/ltmain.sh src/babel-runtime/java/Makefile.in \ src/babel-runtime/m4/Makefile.in src/babel-runtime/m4/argz.m4 \ src/babel-runtime/m4/ltoptions.m4 src/babel-runtime/m4/libtool.m4 \ src/babel-runtime/m4/ltdl.m4 src/babel-runtime/m4/ltsugar.m4 \ src/babel-runtime/m4/ltversion.m4 src/babel-runtime/m4/lt~obsolete.m4 \ src/babel-runtime/sidl/Makefile.in src/babel-runtime/sidl/ltdl.c \ src/babel-runtime/sidl/ltdl.h src/babel-runtime/sidlx/Makefile.in rm -f src/config.log src/config.status src/HYPRE_config.h rm -f src/parcsr_ls/flexgmres.c src/parcsr_ls/HYPRE_flexgmres.c rm -rf src/babel-runtime/libltdl dh_clean if [ -e src/configure.keep ]; then \ for keepfile in $(KEEP_FILES); do \ mv -f $$keepfile.keep $$keepfile; \ done; \ fi install: stamp-install stamp-install: stamp-build-arch install -d `pwd`/debian/tmp/usr/include install -d `pwd`/debian/tmp/usr/lib $(MAKE) -C src install HYPRE_INSTALL_DIR=`pwd`/debian/tmp/usr \ prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp/usr touch $@ binary-indep: install dh_testdir -i dh_testroot -i dh_installdirs -i # -a has to come before -i here because -i has ambiguous names dh_movefiles -a dh_movefiles -i dh_installdocs -i dh_installchangelogs -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i binary-arch: install dh_testdir -a dh_testroot -a dh_installdirs -a dh_movefiles -a dh_installdocs -a dh_installchangelogs -a dh_strip -a dh_makeshlibs -a dh_compress -a dh_fixperms -a dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-arch binary-indep .PHONY: patch unpatch binary binary-arch binary-indep install build clean debian/changelog0000664000000000000000000001576012253377461011065 0ustar hypre (2.8.0b-1build1) trusty; urgency=medium * No-change rebuild for libopenmpi1.3 -> libopenmpi1.6 transition. -- Logan Rosen Sun, 15 Dec 2013 14:12:41 -0500 hypre (2.8.0b-1) unstable; urgency=low * New upstream using babel source (closes: #570055, #617406). * Changed 2.8.0 to 2.8.0b full version in package names etc. * Rebuild with new mpi-defaults (closes: #652310). * Split shlibs.patch into fgmres-lib.patch, flexgmres-to-parcsr_ls.patch and and shlibs-interlink.patch for easier forward-porting. * Patched to install all libraries. * Patched configure.in so "aclocal -I ." works. * Move aside files which would otherwise be destroyed by make clean. * Added build-arch and build-indep targets to debian/rules. * Removed unnecessary patch and unpatch targets from debian/rules. * Removed spurious hypre-doc reference from control. * Updated VCS info in control. * Bumped Standards-Version. -- "Adam C. Powell, IV" Wed, 21 Dec 2011 08:59:27 -0500 hypre (2.4.0b-7) unstable; urgency=low * Changed BLAS and LAPACK libs to blas and lapack (closes: #590984). * Changed to Debian Science maintenance with Adam Powell as an uploader. * Added lintian overrides for Adam Powell's name. * Changed to source format 3.0 (quilt). * Other control file updates. * Bumped Standards-Version. -- Adam C. Powell, IV Wed, 04 Aug 2010 21:23:58 -0400 hypre (2.4.0b-6) unstable; urgency=low * Added libltdl-dev to Build-Depends (closes: #559930). -- Adam C. Powell, IV Mon, 07 Dec 2009 17:22:27 -0500 hypre (2.4.0b-5) unstable; urgency=low * Added libtool to Build-Depends, run libtoolize, and copy ltdl.{c,h} into src/babel-runtime/sidl (closes: #559834). * Copy new config.{sub,guess} into config dir (closes: #559484). -- Adam C. Powell, IV Mon, 07 Dec 2009 13:29:30 -0500 hypre (2.4.0b-4) unstable; urgency=low * Added automake and autoconf to Build-Depends, and aclocal and autoconf to build target (closes: #545056, #554709) * Added README.source to describe patch system. * Bumped Standards-Version. -- Adam C. Powell, IV Tue, 17 Nov 2009 10:10:47 -0500 hypre (2.4.0b-3) unstable; urgency=low * Removed backslash from Build-Depends (closes: #535301). * Updated Standards-Version. * Updated debhelper Build-Depends version. -- Adam C. Powell, IV Mon, 20 Jul 2009 15:30:30 -0400 hypre (2.4.0b-2) unstable; urgency=low * Rebuild against new openmpi. -- Adam C. Powell, IV Fri, 20 Mar 2009 11:40:12 -0400 hypre (2.4.0b-1) unstable; urgency=low * New upstream release (closes: #498291, #498733). * Documentation source from upstream is now in src/docs. * Using quilt now to manage patches. * Changed to libtool-revision style of shared library naming libXX-version.so and changed shlib package name accordingly. * Using mpi-default-dev instead of explicitly depending on openmpi or lam (closes: #509780). -- Adam C. Powell, IV Fri, 26 Dec 2008 01:35:57 -0500 hypre (2.0.0.dfsg-7) unstable; urgency=low * Changed libhypre-dev Depends to pull in proper MPI implementation using type-handling (closes: #487253). -- Adam C. Powell, IV Mon, 23 Jun 2008 15:38:19 -0400 hypre (2.0.0.dfsg-6) unstable; urgency=low * Changed -lmpi_cxx to more generic -lmpi++, and removed -lstdc++, instead using BUILD_CXX_SHARED (closes: #484341, #484196). -- Adam C. Powell, IV Tue, 03 Jun 2008 23:36:05 -0400 hypre (2.0.0.dfsg-5) unstable; urgency=low * Added LAPACK to Build-Depends, corrected lib names (closes: #484341, #484196). -- Adam C. Powell, IV Tue, 03 Jun 2008 19:03:39 -0400 hypre (2.0.0.dfsg-4) unstable; urgency=low * Build-Depends on BLAS instead of ATLAS, same with -dev Depends. -- Adam C. Powell, IV Tue, 27 May 2008 15:57:37 -0400 hypre (2.0.0.dfsg-3) unstable; urgency=low * Build-depends on OpenMPI where it exists, LAM otherwise. -- Adam C. Powell, IV Wed, 30 Apr 2008 15:02:25 -0400 hypre (2.0.0.dfsg-2) unstable; urgency=low * Added gfortran to Build-Depends (closes: #477744). -- Adam C. Powell, IV Mon, 28 Apr 2008 18:59:19 -0400 hypre (2.0.0.dfsg-1) unstable; urgency=low * Removed docs directory because of lack of source. * New package closes same bugs as rejected hypre 2.0.0-1 (closes: #451738, #447673, #349885, #436230). * Updated atlas dependency to new libatlas-base-dev name. * Because -dev has only headers and symlinks (no static libs), made it arch all. -- Adam C. Powell, IV Wed, 16 Apr 2008 12:02:12 -0400 hypre (2.0.0-1) unstable; urgency=low * New upstream release (closes: #451738). * Builds against OpenMPI (closes: #447673). * libhypre2.0.0 doesn't need to conflict with and replace older versions (closes: #349885). * No longer builds or installs included SuperLU (closes: #436230). * Only builds shared libs for now, will change this if somebody bugs me. * Forward-ported shared library versioning. * Forward-ported inter-lib links to satisfy dh_shlibdeps. * Created a new lib to resolve HYPRE_FEI and HYPRE_mli inter-lib dependency. -- Adam C. Powell, IV Wed, 21 Nov 2007 13:21:32 -0500 hypre (1.6.0-4) unstable; urgency=low * Rebuild with new mpich and linked against libblas-3.so. * Fixed configure to actually use -with-blas= value. * Fixed build-depends, replacing obsolete mpich with libmpich1.0-dev and adding version 3 BLAS dev. * Appended c2 to shared lib package name since it includes C++ objects. * Massive changes to link shared libs with all of their dependent libs. * Removed HYPRE_BuildIJMatrixFromDistributedMatrix() because it uses an obsolete IJ_mv API. * Got rid of a bunch of @s in Makefiles to make build more transparent. * Added libHYPRE_Euclid to SSTRUCT_LFLAGS in test/Makefile.in so it works. * Added Makefile removal to clean target to avoid bloated .diff.gz. * Added installation of lintian overrides files. -- Adam C. Powell, IV Thu, 8 Sep 2005 23:22:43 -0400 hypre (1.6.0-3) unstable; urgency=low * Commented -DBOOL_NOT_SUPPORTED erroneous flags in src/FEI_mv/fei-hypre/Makefile.in (closes: #249525). * Removed gcc | c-compiler from Build-Depends. * Added lintian overrides for GPL false positives in copyright file. -- Adam C. Powell, IV Wed, 11 Aug 2004 22:25:09 -0400 hypre (1.6.0-2) unstable; urgency=low * Added mpich to build-depends (closes: #220591). -- Adam C. Powell, IV Thu, 13 Nov 2003 10:28:17 -0500 hypre (1.6.0-1) unstable; urgency=low * First packaging attempt (closes: #207414). * Added shared library building to each Makefile.in. * doc-base index for user and reference manuals. -- Adam C. Powell, IV Thu, 2 Oct 2003 14:52:22 -0400 debian/compat0000664000000000000000000000000211672633576010406 0ustar 7 debian/libhypre-dev.files0000664000000000000000000000005111672633576012622 0ustar usr/lib/*.a usr/lib/*.so usr/include/*.h debian/README.source0000664000000000000000000000024111672633576011364 0ustar Please refer to /usr/share/doc/quilt/README.source for information on how to manipulate the patches for this package, which are in the debian/patches directory. debian/copyright0000664000000000000000000000337011674345765011150 0ustar This package was debianized by Adam C. Powell, IV on August 27, 2003. It was downloaded from http://www.llnl.gov/CASC/hypre/ . The 2.8.0b copyright notice itself is given in the upstream source COPYRIGHT file, which is reproduced below. The GNU Lesser General Public License version 2.1 mentioned therein is in the upstream source COPYING.LESSER file, and is also in /usr/share/common-licenses/LGPL-2.1 on Debian systems. ------------------------------------------------------------------------------ COPYRIGHT The following copyright applies to each file in the HYPRE distribution, unless otherwise stated in the file: Copyright (c) 2008, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE. This file is part of HYPRE. LICENSE HYPRE is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library (file COPYING.LESSER); if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA CONTACT INFORMATION The HYPRE team can be contacted at hypre-support@llnl.gov. The software is released under UCRL_CODE_222953. Please see http://www.llnl.gov/CASC/hypre for more information and source code availability. debian/source/0000775000000000000000000000000011672633576010510 5ustar debian/source/format0000664000000000000000000000001411672633576011716 0ustar 3.0 (quilt) debian/source/lintian-overrides0000664000000000000000000000023511672633576014071 0ustar # Lintian thinks uploader Adam Powell's name violates policy hypre source: uploader-address-missing "Adam C. Powell hypre source: uploader-not-full-name IV" debian/control0000664000000000000000000000263011674345727010614 0ustar Source: hypre Section: math Priority: extra Maintainer: Debian Science Maintainers Uploaders: "Adam C. Powell, IV" Standards-Version: 3.9.2 Build-Depends: debhelper (>= 7), quilt, gfortran, autoconf, automake, libtool, libltdl-dev, libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so, libsuperlu3-dev, mpi-default-dev Vcs-Git: git://anonscm.debian.org/debian-science/packages/hypre.git Vcs-Browser: http://anonscm.debian.org/?p=debian-science/packages/hypre.git Homepage: http://acts.nersc.gov/hypre/ Package: libhypre-2.8.0b Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: High Performance Matrix Preconditioners - Shared Library Hypre is a set of matrix preconditioning libraries to aid in the solution of large systems of linear equations. . This package contains the shared libraries. Package: libhypre-dev Architecture: all Section: libdevel Depends: libhypre-2.8.0b (>= ${source:Version}), libsuperlu3-dev, mpi-default-dev, libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so, ${misc:Depends} Description: High Performance Matrix Preconditioners - Development Files Hypre is a set of matrix preconditioning libraries to aid in the solution of large systems of linear equations. . This package contains the headers and symlinks necessary to develop programs which use hypre. debian/patches/0000775000000000000000000000000011674357361010634 5ustar debian/patches/fgmres-lib.patch0000664000000000000000000001302111674357361013701 0ustar 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/src/config/configure.in =================================================================== --- hypre.orig/src/config/configure.in +++ hypre/src/config/configure.in @@ -893,7 +893,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/lib/*.o" if test "$hypre_using_superlu" = "yes" Index: hypre/src/FEI_mv/fei-hypre/Makefile =================================================================== --- hypre.orig/src/FEI_mv/fei-hypre/Makefile +++ hypre/src/FEI_mv/fei-hypre/Makefile @@ -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/src/FEI_mv/fgmres/Makefile =================================================================== --- /dev/null +++ hypre/src/FEI_mv/fgmres/Makefile @@ -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} debian/patches/shlibs-interlink.patch0000664000000000000000000004763411674345665015160 0ustar This patch has several purposes: * Add "HYPRE_LIBS" and "SYSTEM_LIBS" for each library, and link to them. * Build shared libraries with filename and soname linker flag including the version extension -2.8.0b.so, and link the .so to that file. * Also pass "-z defs" to the linker. * Change libHYPRE-2.8.0b.so (and libHYPRE.so link) to link with all of the hypre libs instead of duplicating all of the object files, cutting the installed size roughly in half. Index: hypre/src/FEI_mv/fei-hypre/Makefile =================================================================== --- hypre.orig/src/FEI_mv/fei-hypre/Makefile +++ hypre/src/FEI_mv/fei-hypre/Makefile @@ -61,6 +61,19 @@ ${SUPERLU_INCLUDE}\ ${CXXINCLUDES} + +HYPRE_LIBS = \ + ../../utilities/libHYPRE_utilities.so \ + ../../seq_mv/libHYPRE_seq_mv.so \ + ../../parcsr_mv/libHYPRE_parcsr_mv.so \ + ../../IJ_mv/libHYPRE_IJ_mv.so \ + ../../parcsr_ls/libHYPRE_parcsr_ls.so \ + ../fgmres/libHYPRE_FEI_fgmres.so \ + ../femli/lib/libHYPRE_mli.so \ + ../../krylov/libHYPRE_krylov.so + +SYSTEM_LIBS = -lmpi -lm -lmpi++ -lsuperlu + HEADERS =\ cfei-hypre.h\ cfei_hypre.h\ @@ -200,9 +213,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_FEI.so: ${OBJS} +libHYPRE_FEI.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/FEI_mv/femli/lib/Makefile =================================================================== --- hypre.orig/src/FEI_mv/femli/lib/Makefile +++ hypre/src/FEI_mv/femli/lib/Makefile @@ -10,6 +10,18 @@ # $Revision: 1.19 $ #EHEADER********************************************************************** +HYPRE_LIBS = \ + ../../../utilities/libHYPRE_utilities.so \ + ../../../krylov/libHYPRE_krylov.so \ + ../../../seq_mv/libHYPRE_seq_mv.so \ + ../../../parcsr_mv/libHYPRE_parcsr_mv.so \ + ../../../IJ_mv/libHYPRE_IJ_mv.so \ + ../../../distributed_ls/ParaSails/libHYPRE_ParaSails.so \ + ../../../parcsr_ls/libHYPRE_parcsr_ls.so \ + ../../fgmres/libHYPRE_FEI_fgmres.so + +SYSTEM_LIBS = -lmpi -lm -lmpi++ -lsuperlu \ + ${LAPACKLIBDIRS} ${LAPACKLIBS} include ../../../config/Makefile.config @@ -154,9 +166,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_mli.so: ${OBJS} +libHYPRE_mli.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/IJ_mv/Makefile =================================================================== --- hypre.orig/src/IJ_mv/Makefile +++ hypre/src/IJ_mv/Makefile @@ -25,6 +25,13 @@ -I$(srcdir)/../parcsr_ls\ ${CINCLUDES} +HYPRE_LIBS = \ + ../utilities/libHYPRE_utilities.so \ + ../seq_mv/libHYPRE_seq_mv.so \ + ../parcsr_mv/libHYPRE_parcsr_mv.so + +SYSTEM_LIBS = -lmpi + HEADERS =\ aux_parcsr_matrix.h\ aux_par_vector.h\ @@ -84,9 +91,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_IJ_mv.so: ${OBJS} +libHYPRE_IJ_mv.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/distributed_ls/Euclid/Makefile =================================================================== --- hypre.orig/src/distributed_ls/Euclid/Makefile +++ hypre/src/distributed_ls/Euclid/Makefile @@ -31,6 +31,10 @@ -I$(srcdir)/../../hypre/include\ ${CINCLUDES} +HYPRE_LIBS = ../../parcsr_mv/libHYPRE_parcsr_mv.so ../../utilities/libHYPRE_utilities.so + +SYSTEM_LIBS = -lmpi -lm + HEADERS =\ blas_dh.h\ euclid_common.h\ @@ -121,9 +125,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_Euclid.so: ${OBJS} +libHYPRE_Euclid.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/distributed_ls/ParaSails/Makefile =================================================================== --- hypre.orig/src/distributed_ls/ParaSails/Makefile +++ hypre/src/distributed_ls/ParaSails/Makefile @@ -23,6 +23,13 @@ -I$(srcdir)/../../distributed_matrix\ ${CINCLUDES} +HYPRE_LIBS = \ + ../../utilities/libHYPRE_utilities.so \ + ../../IJ_mv/libHYPRE_IJ_mv.so \ + ../../distributed_matrix/libHYPRE_DistributedMatrix.so + +SYSTEM_LIBS = -lmpi -lm ${BLASLIBDIRS} ${BLASLIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS} + HEADERS =\ Common.h\ ConjGrad.h\ @@ -84,9 +91,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_ParaSails.so: ${OBJS} +libHYPRE_ParaSails.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/distributed_ls/pilut/Makefile =================================================================== --- hypre.orig/src/distributed_ls/pilut/Makefile +++ hypre/src/distributed_ls/pilut/Makefile @@ -23,6 +23,12 @@ -I$(srcdir)/../../distributed_matrix\ ${CINCLUDES} +HYPRE_LIBS = \ + ../../utilities/libHYPRE_utilities.so \ + ../../distributed_matrix/libHYPRE_DistributedMatrix.so + +SYSTEM_LIBS = -lmpi -lm ${BLASLIBDIRS} ${BLASLIBS} + HEADERS = \ HYPRE_DistributedMatrixPilutSolver_protos.h\ HYPRE_DistributedMatrixPilutSolver_types.h\ @@ -78,9 +84,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_DistributedMatrixPilutSolver.so: ${OBJS} +libHYPRE_DistributedMatrixPilutSolver.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/distributed_matrix/Makefile =================================================================== --- hypre.orig/src/distributed_matrix/Makefile +++ hypre/src/distributed_matrix/Makefile @@ -23,6 +23,8 @@ -I$(srcdir)/../seq_mv\ ${CINCLUDES} +LIBS = ../utilities/libHYPRE_utilities.so ../parcsr_mv/libHYPRE_parcsr_mv.so + EXTRA_HEADERS = internal_protos.h HEADERS =\ @@ -69,9 +71,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_DistributedMatrix.so: ${OBJS} +libHYPRE_DistributedMatrix.so: ${OBJS} ${LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/krylov/Makefile =================================================================== --- hypre.orig/src/krylov/Makefile +++ hypre/src/krylov/Makefile @@ -22,6 +22,10 @@ -I$(srcdir)/../utilities\ ${CINCLUDES} +HYPRE_LIBS = ../utilities/libHYPRE_utilities.so ../multivector/libHYPRE_multivector.so + +SYSTEM_LIBS = ${LAPACKLIBDIRS} ${LAPACKLIBS} -lm + HEADERS =\ HYPRE_krylov.h\ krylov.h\ @@ -86,9 +90,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_krylov.so: ${OBJS} +libHYPRE_krylov.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/lib/Makefile =================================================================== --- hypre.orig/src/lib/Makefile +++ hypre/src/lib/Makefile @@ -13,27 +13,6 @@ include ../config/Makefile.config -SUPERLUFILES = ${HYPRE_FEI_SUPERLU_FILES} -FEIHYPREFILES = ${HYPRE_FEI_HYPRE_FILES} -FEMLIFILES = ${HYPRE_FEI_FEMLI_FILES} -IJMVFILES = ${HYPRE_SRC_TOP_DIR}/IJ_mv/*.o -EUCLIDFILES = ${HYPRE_SRC_TOP_DIR}/distributed_ls/Euclid/*.o -PARASAILSFILES = ${HYPRE_SRC_TOP_DIR}/distributed_ls/ParaSails/*.o -PILUTFILES = ${HYPRE_SRC_TOP_DIR}/distributed_ls/pilut/*.o -DISTMATRIXFILES = ${HYPRE_SRC_TOP_DIR}/distributed_matrix/*.o -KRYLOVFILES = ${HYPRE_SRC_TOP_DIR}/krylov/*.o -MATMATFILES = ${HYPRE_SRC_TOP_DIR}/matrix_matrix/*.o -MULTIVECFILES = ${HYPRE_SRC_TOP_DIR}/multivector/*.o -PARCSRLSFILES = ${HYPRE_SRC_TOP_DIR}/parcsr_ls/*.o -PARCSRMVFILES = ${HYPRE_SRC_TOP_DIR}/parcsr_mv/*.o -PARCSRBLOCKMVFILES = ${HYPRE_SRC_TOP_DIR}/parcsr_block_mv/*.o -SEQMVFILES = ${HYPRE_SRC_TOP_DIR}/seq_mv/*.o -SSTRUCTLSFILES = ${HYPRE_SRC_TOP_DIR}/sstruct_ls/*.o -SSTRUCTMVFILES = ${HYPRE_SRC_TOP_DIR}/sstruct_mv/*.o -STRUCTLSFILES = ${HYPRE_SRC_TOP_DIR}/struct_ls/*.o -STRUCTMVFILES = ${HYPRE_SRC_TOP_DIR}/struct_mv/*.o -UTILITIESFILES = ${HYPRE_SRC_TOP_DIR}/utilities/*.o - FILES_HYPRE = \ $(SUPERLUFILES)\ $(FEIHYPREFILES)\ @@ -56,6 +35,28 @@ $(STRUCTMVFILES)\ $(UTILITIESFILES) +LIBS_HYPRE = ../utilities/libHYPRE_utilities.so \ + ../utilities/libHYPRE_utilities.so \ + ../multivector/libHYPRE_multivector.so \ + ../krylov/libHYPRE_krylov.so \ + ../struct_mv/libHYPRE_struct_mv.so \ + ../struct_ls/libHYPRE_struct_ls.so \ + ../sstruct_mv/libHYPRE_sstruct_mv.so \ + ../sstruct_ls/libHYPRE_sstruct_ls.so \ + ../seq_mv/libHYPRE_seq_mv.so \ + ../parcsr_mv/libHYPRE_parcsr_mv.so \ + ../parcsr_block_mv/libHYPRE_parcsr_block_mv.so \ + ../distributed_matrix/libHYPRE_DistributedMatrix.so \ + ../matrix_matrix/libHYPRE_MatrixMatrix.so \ + ../IJ_mv/libHYPRE_IJ_mv.so \ + ../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/fgmres/libHYPRE_FEI_fgmres.so \ + ../FEI_mv/femli/lib/libHYPRE_mli.so \ + ../FEI_mv/fei-hypre/libHYPRE_FEI.so + SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS} @@ -102,7 +103,7 @@ ${AR} $@ $(UTILITIESFILES) ${RANLIB} $@ -libHYPRE.so: ${FILES_HYPRE} +libHYPRE.so: ${LIBS_HYPRE} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${FILES_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} + ${BUILD_CC_SHARED} -o ${SONAME} ${LIBS_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ Index: hypre/src/matrix_matrix/Makefile =================================================================== --- hypre.orig/src/matrix_matrix/Makefile +++ hypre/src/matrix_matrix/Makefile @@ -24,6 +24,12 @@ -I$(srcdir)/../parcsr_mv\ ${CINCLUDES} +LIBS = \ + ../parcsr_mv/libHYPRE_parcsr_mv.so \ + ../distributed_matrix/libHYPRE_DistributedMatrix.so \ + ../utilities/libHYPRE_utilities.so +# ../IJ_mv/libHYPRE_IJ_mv.so + EXTRA_FILES =\ internal_protos.h @@ -64,9 +70,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_MatrixMatrix.so: ${OBJS} +libHYPRE_MatrixMatrix.so: ${OBJS} ${LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/multivector/Makefile =================================================================== --- hypre.orig/src/multivector/Makefile +++ hypre/src/multivector/Makefile @@ -60,9 +60,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_multivector.so: ${OBJS} +libHYPRE_multivector.so: ${OBJS} ../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} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/parcsr_block_mv/Makefile =================================================================== --- hypre.orig/src/parcsr_block_mv/Makefile +++ hypre/src/parcsr_block_mv/Makefile @@ -28,8 +28,15 @@ -I$(srcdir)/../krylov\ ${CINCLUDES} +HYPRE_LIBS = \ + ../utilities/libHYPRE_utilities.so \ + ../seq_mv/libHYPRE_seq_mv.so \ + ../parcsr_mv/libHYPRE_parcsr_mv.so + +SYSTEM_LIBS = -lmpi -lm + LFLAGS = \ - -L. -lHYPRE_parcsr_block_mv -L../hypre/lib -lHYPRE_krylov \ + -L../hypre/lib -lHYPRE_parcsr_block_mv -L../hypre/lib -lHYPRE_krylov \ -lHYPRE_parcsr_ls -lHYPRE_ParaSails -lHYPRE_Euclid \ -lHYPRE_DistributedMatrixPilutSolver -lHYPRE_IJ_mv \ -lHYPRE_parcsr_mv -lHYPRE_seq_mv -lHYPRE_DistributedMatrix \ @@ -114,9 +121,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_parcsr_block_mv.so: ${OBJS} +libHYPRE_parcsr_block_mv.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/parcsr_ls/Makefile =================================================================== --- hypre.orig/src/parcsr_ls/Makefile +++ hypre/src/parcsr_ls/Makefile @@ -36,6 +36,22 @@ -I$(srcdir)/../parcsr_block_mv\ ${CINCLUDES} +HYPRE_LIBS = \ + ../utilities/libHYPRE_utilities.so \ + ../multivector/libHYPRE_multivector.so \ + ../krylov/libHYPRE_krylov.so \ + ../seq_mv/libHYPRE_seq_mv.so \ + ../parcsr_mv/libHYPRE_parcsr_mv.so \ + ../parcsr_block_mv/libHYPRE_parcsr_block_mv.so \ + ../distributed_matrix/libHYPRE_DistributedMatrix.so \ + ../IJ_mv/libHYPRE_IJ_mv.so \ + ../matrix_matrix/libHYPRE_MatrixMatrix.so \ + ../distributed_ls/pilut/libHYPRE_DistributedMatrixPilutSolver.so \ + ../distributed_ls/ParaSails/libHYPRE_ParaSails.so \ + ../distributed_ls/Euclid/libHYPRE_Euclid.so + +SYSTEM_LIBS = -lmpi -lm $(LAPACKLIBDIRS) $(LAPACKLIBS) + HEADERS =\ HYPRE_parcsr_ls.h\ _hypre_parcsr_ls.h\ @@ -162,9 +178,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_parcsr_ls.so: ${OBJS} +libHYPRE_parcsr_ls.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/parcsr_mv/Makefile =================================================================== --- hypre.orig/src/parcsr_mv/Makefile +++ hypre/src/parcsr_mv/Makefile @@ -23,6 +23,10 @@ -I$(srcdir)/../seq_mv\ ${CINCLUDES} +HYPRE_LIBS = ../seq_mv/libHYPRE_seq_mv.so ../utilities/libHYPRE_utilities.so + +SYSTEM_LIBS = -lmpi + HEADERS =\ headers.h\ HYPRE_parcsr_mv.h\ @@ -128,9 +132,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_parcsr_mv.so: ${OBJS} +libHYPRE_parcsr_mv.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/seq_mv/Makefile =================================================================== --- hypre.orig/src/seq_mv/Makefile +++ hypre/src/seq_mv/Makefile @@ -77,9 +77,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_seq_mv.so: ${OBJS} +libHYPRE_seq_mv.so: ${OBJS} ../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} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/seq_ls/pamg/Makefile =================================================================== --- hypre.orig/src/seq_ls/pamg/Makefile +++ hypre/src/seq_ls/pamg/Makefile @@ -27,11 +27,9 @@ LFLAGS =\ ${LD_LINK_FLAGS}\ - -L.\ -L../../seq_mv\ -L../../utilities\ -L../../krylov\ - -lHYPRE_amg_ls\ -lHYPRE_seq_mv\ -lHYPRE_utilities\ -lHYPRE_krylov\ @@ -118,7 +116,7 @@ libHYPRE_amg_ls.so: ${OBJS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/sstruct_ls/Makefile =================================================================== --- hypre.orig/src/sstruct_ls/Makefile +++ hypre/src/sstruct_ls/Makefile @@ -31,6 +31,20 @@ -I$(srcdir)/../parcsr_ls\ ${CINCLUDES} +HYPRE_LIBS = \ + ../utilities/libHYPRE_utilities.so \ + ../multivector/libHYPRE_multivector.so \ + ../krylov/libHYPRE_krylov.so \ + ../struct_mv/libHYPRE_struct_mv.so \ + ../struct_ls/libHYPRE_struct_ls.so \ + ../seq_mv/libHYPRE_seq_mv.so \ + ../parcsr_mv/libHYPRE_parcsr_mv.so \ + ../IJ_mv/libHYPRE_IJ_mv.so \ + ../parcsr_ls/libHYPRE_parcsr_ls.so \ + ../sstruct_mv/libHYPRE_sstruct_mv.so + +SYSTEM_LIBS = -lmpi -lm + HEADERS =\ HYPRE_sstruct_ls.h\ _hypre_sstruct_ls.h\ @@ -141,9 +155,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_sstruct_ls.so: ${OBJS} +libHYPRE_sstruct_ls.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/sstruct_mv/Makefile =================================================================== --- hypre.orig/src/sstruct_mv/Makefile +++ hypre/src/sstruct_mv/Makefile @@ -26,6 +26,14 @@ -I$(srcdir)/../IJ_mv\ ${CINCLUDES} +HYPRE_LIBS = \ + ../utilities/libHYPRE_utilities.so \ + ../struct_mv/libHYPRE_struct_mv.so \ + ../parcsr_mv/libHYPRE_parcsr_mv.so \ + ../IJ_mv/libHYPRE_IJ_mv.so + +SYSTEM_LIBS = -lmpi + HEADERS =\ HYPRE_sstruct_mv.h\ _hypre_sstruct_mv.h\ @@ -92,9 +100,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_sstruct_mv.so: ${OBJS} +libHYPRE_sstruct_mv.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/struct_ls/Makefile =================================================================== --- hypre.orig/src/struct_ls/Makefile +++ hypre/src/struct_ls/Makefile @@ -25,6 +25,15 @@ -I$(srcdir)/../struct_mv\ ${CINCLUDES} +HYPRE_LIBS = \ + ../utilities/libHYPRE_utilities.so \ + ../multivector/libHYPRE_multivector.so \ + ../krylov/libHYPRE_krylov.so \ + ../parcsr_ls/libHYPRE_parcsr_ls.so \ + ../struct_mv/libHYPRE_struct_mv.so + +SYSTEM_LIBS = -lmpi -lm + HEADERS =\ HYPRE_struct_ls.h\ _hypre_struct_ls.h\ @@ -132,9 +141,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_struct_ls.so: ${OBJS} +libHYPRE_struct_ls.so: ${OBJS} ${HYPRE_LIBS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ ${SYSTEM_LIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/struct_mv/Makefile =================================================================== --- hypre.orig/src/struct_mv/Makefile +++ hypre/src/struct_mv/Makefile @@ -104,9 +104,9 @@ ${AR} $@ ${OBJS} ${RANLIB} $@ -libHYPRE_struct_mv.so: ${OBJS} +libHYPRE_struct_mv.so: ${OBJS} ../utilities/libHYPRE_utilities.so @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} $^ -lmpi -lm ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} Index: hypre/src/utilities/Makefile =================================================================== --- hypre.orig/src/utilities/Makefile +++ hypre/src/utilities/Makefile @@ -98,7 +98,7 @@ libHYPRE_utilities.so: ${OBJS} @echo "Building $@ ... " - ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} -lmpi -lm ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ln -s ${SONAME} $@ ${OBJS}: ${HEADERS} debian/patches/series0000664000000000000000000000016011674212251012032 0ustar flexgmres-to-parcsr_ls.patch fgmres-lib.patch shlibs-interlink.patch config-update-dir.patch install-libs.patch debian/patches/flexgmres-to-parcsr_ls.patch0000664000000000000000000000156611674203770016261 0ustar Move (HYPRE_)flexgmres.c from krylov to parcsr_ls to resolve another circular dependency between those two libraries. Index: hypre/src/krylov/Makefile =================================================================== --- hypre.orig/src/krylov/Makefile +++ hypre/src/krylov/Makefile @@ -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/src/parcsr_ls/Makefile =================================================================== --- hypre.orig/src/parcsr_ls/Makefile +++ hypre/src/parcsr_ls/Makefile @@ -124,7 +124,9 @@ block_tridiag.c\ ams.c\ ads.c\ - ame.c + ame.c\ + flexgmres.c\ + HYPRE_flexgmres.c OBJS = ${FILES:.c=.o} debian/patches/config-update-dir.patch0000664000000000000000000000124411673750643015156 0ustar 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@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 $) debian/patches/install-libs.patch0000664000000000000000000003350611674215301014244 0ustar 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 debian/libhypre-2.8.0b.files0000664000000000000000000000002411674345225012644 0ustar usr/lib/*-2.8.0b.so