diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-12 01:16:13 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-12 01:16:13 -0700 |
| commit | 5b9e0d821dd428792bd51ed03af2b800924ce69d (patch) | |
| tree | e789152a7a0fd6ae4eb0a7d0e572d392f81beca4 /extra/hdf5-openmpi | |
| parent | 207b7c7b0d7bc0db898a2386a665bdb20495fb19 (diff) | |
Sun May 12 01:15:39 PDT 2013
Diffstat (limited to 'extra/hdf5-openmpi')
| -rw-r--r-- | extra/hdf5-openmpi/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/hdf5-openmpi/mpi.patch | 18 |
2 files changed, 27 insertions, 3 deletions
diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD index 63b23bbf0..1baabfe14 100644 --- a/extra/hdf5-openmpi/PKGBUILD +++ b/extra/hdf5-openmpi/PKGBUILD @@ -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 @@ depends=('zlib' 'sh' 'openmpi') 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 \ diff --git a/extra/hdf5-openmpi/mpi.patch b/extra/hdf5-openmpi/mpi.patch new file mode 100644 index 000000000..4fadc13e2 --- /dev/null +++ b/extra/hdf5-openmpi/mpi.patch @@ -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> + |