[gmt] 04/05: Add patch to find the HDF5 library required for NetCDF in experimental.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository gmt.

commit cf85d950390498d8c7bfac685f94c82ea2537277
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 29 21:56:17 2015 +0200

    Add patch to find the HDF5 library required for NetCDF in experimental.
---
 debian/changelog              |  6 ++++++
 debian/patches/hdf5-mpi.patch | 23 +++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 744691a..81d8ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmt (5.1.2+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Add patch to find the HDF5 library required for NetCDF in experimental.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 29 Jul 2015 21:55:47 +0200
+
 gmt (5.1.2+dfsg1-1) unstable; urgency=medium
 
   * Add patch rename psl library to gmt-psl to resolve conflict with
diff --git a/debian/patches/hdf5-mpi.patch b/debian/patches/hdf5-mpi.patch
new file mode 100644
index 0000000..c2bce1b
--- /dev/null
+++ b/debian/patches/hdf5-mpi.patch
@@ -0,0 +1,23 @@
+Description: Search for HDF5 library in other paths too.
+ The HDF5 libraries are installation in non-standard locations in Debian,
+ not in the same directory as the NetCDF library.
+Author: Bas Couwenberg <sebastic at debian.org>
+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
+ 	/opt
+ )
+ 
++include (FindHDF5)
++
+ # find all libs that nc-config reports
+ foreach (_extralib ${_netcdf_lib})
+ 	find_library (_found_lib_${_extralib}
+ 		NAMES ${_extralib}
+-		PATHS ${_netcdf_libpath})
++		PATHS ${_netcdf_libpath} ${HDF5_LIBRARY_DIRS})
+ 	list (APPEND NETCDF_LIBRARY ${_found_lib_${_extralib}})
+ endforeach (_extralib)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ae9a6fd..9c286f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ mips.patch
 manpage-section.patch
 dont-use-timestamped-gzip.patch
 rename-libpsl-to-libgmt-psl.patch
+hdf5-mpi.patch

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