[petsc] 06/07: Revert "Configure for hdf5 using pkg-config"

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository petsc.

commit df132644d8baebdbeee34d489db88b603f33c819
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Nov 2 02:13:29 2017 +0800

    Revert "Configure for hdf5 using pkg-config"
    
    This reverts commit 909bcd4cc203c08cfd2720ab6ccd12d82be05fd8.
    
    PETSc option --with-hdf5-pkg-config tests for hdf5 include files via
      pkg-config hdf5 --variable=includedir
    but no such variable is defined in hdf5.pc. So --with-hdf5-pkg-config
    fails.
    
    pkg-config hdf5 --cflags
    shows the include dir, but mixed with -I/usr/include/openmpi.
    For that reason it's not so convenient to use --with-hdf5-include.
    Would have to fiddle with the data used for it.
    
    --with-hdf5-dir worked well enough. Keep using it for now.
---
 debian/changelog | 1 -
 debian/rules     | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de1e531..8ae1f36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,6 @@ petsc (3.8.0+dfsg1-1exp1) UNRELEASED; urgency=medium
         configure-kfreebsd8.patch
   * New package structure: drop patch-specific versions and alternatives
     i.e. drop 3.8.0 specific packages, any 3.8.Z will satisfy petsc3.8
-  * Configure for hdf5 using pkg-config.
 
  -- Drew Parsons <dparsons at debian.org>  Thu, 19 Oct 2017 09:59:02 +0800
 
diff --git a/debian/rules b/debian/rules
index 16dc7af..53b627c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,10 @@ MPI_DEPENDS=$(shell debian/extract_MPI_dependency)
 # facilitate build-time testing (invoking OpenMPI) when building in a chroot (pbuilder or sbuild)
 export OMPI_MCA_plm_rsh_agent=/bin/false
 
+HDF5_SERIAL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+HDF5_MPI_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+PETSC_HDF5_FLAGS=$(shell if [ -e $(HDF5_MPI_DIR)/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=$(HDF5_MPI_DIR)"; else if [ -e $(HDF5_SERIAL_DIR)/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=$(HDF5_SERIAL_DIR)"; fi; fi)
+
 PETSC_REAL_BUILD_DIR=$(PETSC_ARCH)-real
 PETSC_REAL_DEBUG_BUILD_DIR=$(PETSC_ARCH)-real-debug
 PETSC_COMPLEX_BUILD_DIR=$(PETSC_ARCH)-complex
@@ -102,8 +106,7 @@ CONFIGURATION_OPTIONS=--with-shared-libraries --with-pic=1 \
 	  --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 \
-	  --with-hdf5-pkg-config=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
-	  --CXX_LINKER_FLAGS="-Wl,--no-as-needed"
+	  $(PETSC_HDF5_FLAGS) --CXX_LINKER_FLAGS="-Wl,--no-as-needed"
 
 
 # hypre is only supported with real numbers, not complex

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