[gmt] 01/08: Use mpi-default-dev to select the architecture specific HDF5 MPI flavor.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository gmt.

commit 38849f089825d9a73fb581ca6f42ad0e25f50f50
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 30 22:39:17 2015 +0200

    Use mpi-default-dev to select the architecture specific HDF5 MPI flavor.
---
 debian/changelog              |  6 ++++++
 debian/control                |  1 +
 debian/patches/hdf5-mpi.patch | 12 ++++++++++--
 debian/rules                  | 11 ++++++++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f37c8d2..67e6bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmt (5.1.2+dfsg1-2~exp2) UNRELEASED; urgency=medium
+
+  * Use mpi-default-dev to select the architecture specific HDF5 MPI flavor.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 30 Jul 2015 22:35:49 +0200
+
 gmt (5.1.2+dfsg1-2~exp1) experimental; urgency=medium
 
   * Add patch to find the HDF5 library required for NetCDF in experimental.
diff --git a/debian/control b/debian/control
index 435fd24..be2cfac 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9),
                libpcre3-dev,
                libxaw7-dev,
                libxmu-headers,
+               mpi-default-dev,
                python-sphinx,
                texlive,
                texlive-latex-extra,
diff --git a/debian/patches/hdf5-mpi.patch b/debian/patches/hdf5-mpi.patch
index c2bce1b..55b59a5 100644
--- a/debian/patches/hdf5-mpi.patch
+++ b/debian/patches/hdf5-mpi.patch
@@ -6,11 +6,19 @@ Forwarded: http://gmt.soest.hawaii.edu/issues/732
 
 --- a/cmake/modules/FindNETCDF.cmake
 +++ b/cmake/modules/FindNETCDF.cmake
-@@ -105,11 +105,13 @@ find_library (NETCDF_LIBRARY
+@@ -105,11 +105,21 @@ find_library (NETCDF_LIBRARY
  	/opt
  )
  
-+include (FindHDF5)
++if (NOT DEFINED HDF5_LIBRARY_DIRS)
++  set (HDF5_LIBRARY_DIRS "")
++endif (NOT DEFINED HDF5_LIBRARY_DIRS)
++
++if (NOT DEFINED HDF5_INCLUDE_DIRS)
++  set (HDF5_INCLUDE_DIRS "")
++else (NOT DEFINED HDF5_INCLUDE_DIRS)
++  list (APPEND NETCDF_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
++endif (NOT DEFINED HDF5_INCLUDE_DIRS)
 +
  # find all libs that nc-config reports
  foreach (_extralib ${_netcdf_lib})
diff --git a/debian/rules b/debian/rules
index 226bd53..ebe93c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,13 @@ ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
    export DH_VERBOSE
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+include /usr/share/mpi-default-dev/debian_defaults
+
+HDF5_INCLUDE_PATH=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%d %B %Y" -f -)
 
@@ -27,7 +34,9 @@ CMAKE_OPTS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
              -DFLOCK=on \
              -DGMT_INSTALL_MODULE_LINKS=off \
              -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \
-             -DLICENSE_RESTRICTED=LGPL 
+             -DLICENSE_RESTRICTED=LGPL \
+             -DHDF5_INCLUDE_DIRS=$(HDF5_INCLUDE_PATH) \
+             -DHDF5_LIBRARY_DIRS=$(HDF5_LIBRARY_PATH)
 
 %:
 	dh $@ --buildsystem cmake \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git