[netcdf] 14/19: WIP: hdf5 location fix

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Apr 17 15:35:02 UTC 2016


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

mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.

commit bce96fe1251820f8ce889efc475f27f95204f629
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Feb 21 14:27:52 2016 +0000

    WIP: hdf5 location fix
---
 debian/patches/hdf5-location.patch | 15 +++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/hdf5-location.patch b/debian/patches/hdf5-location.patch
new file mode 100644
index 0000000..e3d4bd0
--- /dev/null
+++ b/debian/patches/hdf5-location.patch
@@ -0,0 +1,15 @@
+Index: netcdf-4.4.0/CMakeLists.txt
+===================================================================
+--- netcdf-4.4.0.orig/CMakeLists.txt
++++ netcdf-4.4.0/CMakeLists.txt
+@@ -596,8 +596,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     # Find out if HDF5 was built with parallel support.
+     # Do that by checking for the targets H5Pget_fapl_mpiposx and
+     # H5Pget_fapl_mpio in ${HDF5_LIB}.
+-    CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX)
+-    CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
++    CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix ${HDF5_C_LIBRARY} HDF5_IS_PARALLEL_MPIPOSIX)
++    CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio ${HDF5_C_LIBRARY} HDF5_IS_PARALLEL_MPIO)
+     IF(HDF5_IS_PARALLEL_MPIPOSIX OR HDF5_IS_PARALLEL_MPIO)
+       SET(HDF5_PARALLEL ON)
+     ELSE()
diff --git a/debian/patches/series b/debian/patches/series
index 04678ad..86e4aba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ reproducible.patch
 hdf5-library-path.patch
 attributes-typo.patch
 m4-generated-sources.patch
+hdf5-location.patch

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



More information about the Pkg-grass-devel mailing list