[petsc] 02/02: update build-time test for multiarch HDF5

[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 6dbbcdf4c468a3ec58b66f828816a22b4a2af580
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Dec 21 18:44:10 2016 +0800

    update build-time test for multiarch HDF5
    
    test for both mpi and serial versions of HDF5, with preference for mpi.
---
 debian/changelog | 3 +++
 debian/rules     | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0afab45..ada11f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 petsc (3.7.4+dfsg1-8) UNRELEASED; urgency=medium
 
   * update for multiarch MPI. Closes: #848784.
+  * update build-time test for multiarch HDF5
+    - test for both mpi and serial versions of HDF5, with preference
+      for mpi. 
 
  -- Drew Parsons <dparsons at debian.org>  Wed, 21 Dec 2016 18:25:27 +0800
 
diff --git a/debian/rules b/debian/rules
index e8389a1..7d84fb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,9 @@ 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
 
-PETSC_HDF5_FLAGS=$(shell if [ -e /usr/lib/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=/usr"; fi)
+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_BUILD_DIR=$(PETSC_ARCH)-real
 PETSC_DEBUG_BUILD_DIR=$(PETSC_ARCH)-real-debug

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