The following commit has been merged in the master branch: commit 4379ffaf76d26d1e1bcbdb60420c23c6264702f7 Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> Date: Sun Nov 25 11:35:31 2012 +0100
Skip the inclusion of C++ when dealing with parallel HDF5 Thanks to Mike Miller, Rafael Laboissiere & Sebastien Villemot diff --git a/debian/changelog b/debian/changelog index 21ea1b5..7323a56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ hdf5 (1.8.9-1~exp2) experimental; urgency=low + * Skip the inclusion of C++ when dealing with parallel HDF5 + Thanks to Mike Miller, Rafael Laboissiere & Sebastien Villemot + [ Julian Taylor ] * relax-version-check.patch: don't check the compile time patch version at runtime, this saves us full transitions when it is still compatible. (Closes: #693610) - -- Sylvestre Ledru <sylves...@debian.org> Sun, 25 Nov 2012 11:01:16 +0100 + -- Sylvestre Ledru <sylves...@debian.org> Sun, 25 Nov 2012 11:15:21 +0100 hdf5 (1.8.9-1~exp1) experimental; urgency=low diff --git a/debian/patches/series b/debian/patches/series index 5a310ef..205b9e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ mpi.diff path_max.diff ullong_force.diff relax-version-check.patch +skip_cxx_inclusion.diff diff --git a/debian/patches/skip_cxx_inclusion.diff b/debian/patches/skip_cxx_inclusion.diff new file mode 100644 index 0000000..cf4c481 --- /dev/null +++ b/debian/patches/skip_cxx_inclusion.diff @@ -0,0 +1,13 @@ +Index: hdf5.git/src/H5public.h +=================================================================== +--- hdf5.git.orig/src/H5public.h 2012-09-30 14:59:47.443402440 +0200 ++++ hdf5.git/src/H5public.h 2012-11-25 11:14:18.767333174 +0100 +@@ -58,6 +58,8 @@ + # include <stddef.h> + #endif + #ifdef H5_HAVE_PARALLEL ++# define MPICH_SKIP_MPICXX 1 ++# define OMPI_SKIP_MPICXX 1 + # include <mpi.h> + #endif + -- Hierarchical Data Format 5 (HDF5) _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel