summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-06-13 18:59:33 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-06-13 18:59:33 +0000
commitda28dfb00540bfc6b0a407b4f32910d34fb63ed4 (patch)
tree4c0b8768dcdea4b69629a3b0c78a91add9373270 /sci-libs/hdf5/files
parentmarked x86 per bug 420969 (diff)
downloadgentoo-2-da28dfb00540bfc6b0a407b4f32910d34fb63ed4.tar.gz
gentoo-2-da28dfb00540bfc6b0a407b4f32910d34fb63ed4.tar.bz2
gentoo-2-da28dfb00540bfc6b0a407b4f32910d34fb63ed4.zip
Prevent accidental inclusion of mpi c++ headers when hdf5.h is included by third party C++ program/library. Fixes #420777 Juergen Rose <rose@rz.uni-potsdam.de>
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/hdf5/files')
-rw-r--r--sci-libs/hdf5/files/hdf5-1.8.9-mpicxx.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/sci-libs/hdf5/files/hdf5-1.8.9-mpicxx.patch b/sci-libs/hdf5/files/hdf5-1.8.9-mpicxx.patch
new file mode 100644
index 000000000000..28f554c0c592
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.9-mpicxx.patch
@@ -0,0 +1,16 @@
+Prevent accidental inclusion of mpi c++ headers
+when hdf5.h is included third party library
+
+https://bugs.gentoo.org/show_bug.cgi?id=420777
+
+--- a/src/H5public.h
++++ b/src/H5public.h
+@@ -58,6 +58,8 @@
+ # include <stddef.h>
+ #endif
+ #ifdef H5_HAVE_PARALLEL
++# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */
++# define MPICH_SKIP_MPICXX
+ # include <mpi.h>
+ #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
+ # include <mpio.h>