[petsc] 06/07: reactivate hypre support with C language flags

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository petsc.

commit 915630e102ce1ba17b03f554e35cb75e1418b4d3
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Oct 5 01:14:01 2015 +0800

    reactivate hypre support with C language flags
    
    It was the "--with-clanguage=C++ --with-c-support" flags which enabled
    PETSc 3.6.1 to build with hypre support.  Without these flags,
    c99 complex (HAVE_C99_COMPLEX) is applied, which triggers the failure
    to build with hypre 2.8.0b.  Hypre 2.10.0b has been updated to
    properly handle C99.
    
    Hypre needs to be updated in Debian.  In the meantime activate hypre
    support by including --with-clanguage=C++ --with-c-support.
    
    Note that hypre is incompatible with complex number support in PETSc,
    so hypre support is not built into the complex number packages.
---
 debian/changelog | 2 --
 debian/control   | 4 +++-
 debian/rules     | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ede28a..e910285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,6 @@ petsc (3.6.2.dfsg1-1) UNRELEASED; urgency=medium
        separately at https://bitbucket.org/petsc/win32fe but we don't
        need it and therefore don't include it)
   * Standards version 3.9.6.
-  * Support for HYPRE is temporarily deactivated, pending updating of
-    HYPRE to version 2.10.0b-p2 in Debian.
   * PETSc matlab scripts are linked to /usr/share/octave/site/m/petsc.
     Closes: #736662.
   * Add superlu support.  Closes: #671062.
diff --git a/debian/control b/debian/control
index 8ddc018..1c6e994 100644
--- a/debian/control
+++ b/debian/control
@@ -126,8 +126,10 @@ Description: Static libraries, shared links, header files for PETSc
  scientific applications, as well as various papers and talks, demonstrate the
  features of the PETSc libraries.
  .
- This package provides the development files for building applications 
+ This package provides the development files for building applications
  using PETSc 3.6.2 with support for complex numbers.
+ .
+ This deactivates support for HYPRE.
 
 Package: libpetsc-complex-3.6
 Architecture: linux-any hurd-any
diff --git a/debian/rules b/debian/rules
index ee88068..c02d52d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,8 +90,7 @@ CONFIGURATION_OPTIONS=--with-shared-libraries \
 	  --with-ptscotch=1 --with-ptscotch-include=/usr/include/scotch --with-ptscotch-lib="-lptesmumps -lptscotch -lptscotcherr" \
 	  --with-fftw=1 --with-fftw-include=[] --with-fftw-lib="-lfftw3 -lfftw3_mpi" \
 	  --with-superlu=1 --with-superlu-include=/usr/include/superlu --with-superlu-lib=-lsuperlu \
-	  $(PETSC_HDF5_FLAGS) --CXX_LINKER_FLAGS="-Wl,--no-as-needed" 
-#	  --with-hypre=1 --with-hypre-dir=/usr \
+	  $(PETSC_HDF5_FLAGS) --CXX_LINKER_FLAGS="-Wl,--no-as-needed"
 
 
 # main packaging script based on dh7 syntax
@@ -117,6 +116,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) --  \
           --with-debugging=1  \
+          --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ --with-c-support \
           $(CONFIGURATION_OPTIONS)  \
           --prefix=$(PETSC_DIR_DEBUG_PREFIX)  \
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR) \
@@ -125,6 +125,7 @@ override_dh_auto_configure:
             CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"
 	dh_auto_configure -p$(PETSC_VERSIONED_DEV_PACKAGE) --  \
           --with-debugging=0  \
+          --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ --with-c-support \
           $(CONFIGURATION_OPTIONS)  \
           --prefix=$(PETSC_DIR_PREFIX)  \
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_BUILD_DIR) \

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