[petsc] 01/02: Update configuration for HYPRE 2.11.1.

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to tag debian/3.7.4+dfsg1-3
in repository petsc.

commit 0b44844ec72e78222d07ebaacdc32a3b1aa83767
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Nov 1 19:06:58 2016 +0800

    Update configuration for HYPRE 2.11.1.
    
    headers now in /usr/include/hypre
---
 debian/changelog |  7 +++++++
 debian/control   |  2 +-
 debian/rules     | 10 ++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0db8616..a6e3f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+petsc (3.7.4+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Update configuration for HYPRE 2.11.1
+    (headers now in /usr/include/hypre)
+
+ -- Drew Parsons <dparsons at debian.org>  Tue, 01 Nov 2016 19:05:32 +0800
+
 petsc (3.7.4+dfsg1-2) unstable; urgency=medium
 
   * Handle shlibs dependencies via virtual libpetsc3.7 and
diff --git a/debian/control b/debian/control
index 3f38d35..47fe069 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), quilt, python (>= 2.2), gfortran,
  mpi-default-dev (>= 1.0.2),
  libblas-dev, liblapack-dev,
  libsuitesparse-dev (>= 1:4.2.1),
- libspooles-dev (>= 2.2-6), libhypre-dev (>= 2.4.0), libptscotch-dev,
+ libspooles-dev (>= 2.2-6), libhypre-dev (>= 2.11), libptscotch-dev,
  libhdf5-mpi-dev (>= 1.8.8),
  libblacs-mpi-dev, libscalapack-mpi-dev, libmumps-dev,
  libfftw3-dev, libfftw3-mpi-dev, libssl-dev,
diff --git a/debian/rules b/debian/rules
index b83d911..4b3dbed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,6 +110,10 @@ CONFIGURATION_OPTIONS=--with-shared-libraries --with-pic=1 \
 	  $(PETSC_HDF5_FLAGS) --CXX_LINKER_FLAGS="-Wl,--no-as-needed"
 
 
+# hypre is only supported with real numbers, not complex
+HYPRE_CONFIG=--with-hypre=1 --with-hypre-include=/usr/include/hypre \
+	  --with-hypre-lib="-lHYPRE_IJ_mv -lHYPRE_parcsr_ls -lHYPRE_sstruct_ls -lHYPRE_sstruct_mv -lHYPRE_struct_ls -lHYPRE_struct_mv -lHYPRE_utilities"
+
 # main packaging script based on dh7 syntax
 %:
 	dh $@ --with python2
@@ -138,8 +142,9 @@ override_dh_auto_configure:
 	if dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --  \
           --with-debugging=1  \
           --shared-library-extension=_real \
-          --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ \
+          --with-clanguage=C++ \
           $(CONFIGURATION_OPTIONS)  \
+          $(HYPRE_CONFIG)  \
           --prefix=$(PETSC_DIR_DEBUG_PREFIX)  \
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
@@ -154,8 +159,9 @@ override_dh_auto_configure:
 	if dh_auto_configure -p$(PETSC_VERSIONED_DEV_PACKAGE) --  \
           --with-debugging=0  \
           --shared-library-extension=_real \
-          --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ \
+          --with-clanguage=C++ \
           $(CONFIGURATION_OPTIONS)  \
+          $(HYPRE_CONFIG)  \
           --prefix=$(PETSC_DIR_PREFIX)  \
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git