[dolfin] 02/03: patches/HDF5-configure.patch allows HDF5 to be configured in

Drew Parsons dparsons at moszumanska.debian.org
Fri Sep 16 04:06:34 UTC 2016


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

dparsons pushed a commit to branch master
in repository dolfin.

commit 4c929b1d7202d81da6aba1b7b2730f475ebd7190
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Sep 16 10:46:23 2016 +0800

    patches/HDF5-configure.patch allows HDF5 to be configured in
    
    Problems arose since h5pc++ (for C++) does not exist, so cmake
    couldn't find the parallel version of HDF5, leading to build failure
    when HDF5 is enabled.
    
    This patch says use C (h5pcc) instead.
    Add Fortran (h5pfc) too for completeness.
    
    Thanks Johannes Ring for the patch.
---
 debian/changelog                    |  1 +
 debian/patches/HDF5-configure.patch | 13 +++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5ae347a..3b84baa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dolfin (2016.1.0-5) UNRELEASED; urgency=medium
 
   * Reenable HDF5 support.
+  * patches/HDF5-configure.patch helps configure HDF5 parallel.
 
  -- Drew Parsons <dparsons at debian.org>  Fri, 16 Sep 2016 10:06:56 +0800
 
diff --git a/debian/patches/HDF5-configure.patch b/debian/patches/HDF5-configure.patch
new file mode 100644
index 0000000..c15e5e1
--- /dev/null
+++ b/debian/patches/HDF5-configure.patch
@@ -0,0 +1,13 @@
+Index: dolfin/CMakeLists.txt
+===================================================================
+--- dolfin.orig/CMakeLists.txt
++++ dolfin/CMakeLists.txt
+@@ -553,7 +553,7 @@ if (DOLFIN_ENABLE_HDF5)
+     set(ENV{HDF5_ROOT} "$ENV{HDF5_DIR}")
+   endif()
+   set(HDF5_PREFER_PARALLEL TRUE)
+-  find_package(HDF5)
++  find_package(HDF5 COMPONENTS C Fortran)
+   set_package_properties(HDF5 PROPERTIES TYPE OPTIONAL
+     DESCRIPTION "Hierarchical Data Format 5 (HDF5)"
+     URL "https://www.hdfgroup.org/HDF5")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8b205b7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+HDF5-configure.patch

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



More information about the debian-science-commits mailing list