[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD mpi.patch)

[Ronald van Haren]

    Date: Saturday, May 11, 2013 @ 10:51:45
  Author: ronald
Revision: 185113

upgpkg: hdf5-openmpi 1.8.10_patch1-1

update to 1.8.10_patch1; FS#33343 include mpi header

Added:
  hdf5-openmpi/trunk/mpi.patch
Modified:
  hdf5-openmpi/trunk/PKGBUILD

-----------+
 PKGBUILD  |   12 +++++++++---
 mpi.patch |   18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-11 08:31:06 UTC (rev 185112)
+++ PKGBUILD	2013-05-11 08:51:45 UTC (rev 185113)
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.10
+pkgver=1.8.10_patch1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
@@ -18,12 +18,18 @@
 makedepends=('time')
 provides=('hdf5')
 conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 
+mpi.patch) 
 options=('!libtool')
-sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
+sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
+          '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {
   cd $srcdir/${_pkgname}-${pkgver/_/-}
+
+  # FS#33343
+  patch -Np1 -i ${srcdir}/mpi.patch
+
   export CFLAGS="${CFLAGS/O2/O0}"
   export CXXFLAGS="${CFLAGS}"
   ./configure \

Added: mpi.patch
===================================================================
--- mpi.patch	                        (rev 0)
+++ mpi.patch	2013-05-11 08:51:45 UTC (rev 185113)
@@ -0,0 +1,18 @@
+Prevent accidental inclusion of mpi c++ headers 
+when hdf5.h is included third party library
+
+https://bugs.gentoo.org/show_bug.cgi?id=420777
+https://bugs.archlinux.org/task/33343
+
+--- 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>
+