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

[Ronald van Haren]

    Date: Saturday, May 11, 2013 @ 11:31:07
  Author: ronald
Revision: 185119

upgpkg: hdf5 1.8.10_patch1-1

don't need the mpi patch in the regular hdf5 package

Modified:
  hdf5/trunk/PKGBUILD
Deleted:
  hdf5/trunk/mpi.patch

-----------+
 PKGBUILD  |    9 ++-------
 mpi.patch |   18 ------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-11 09:27:57 UTC (rev 185118)
+++ PKGBUILD	2013-05-11 09:31:07 UTC (rev 185119)
@@ -13,18 +13,13 @@
 license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2 
-mpi.patch)
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
-          '658d4a3e537c9c76da3200effa8f95b656a21936')
+sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
 
-  # FS#33343
-  patch -Np1 -i ${srcdir}/mpi.patch 
-
   export CFLAGS="${CFLAGS/O2/O0}"
   export CXXFLAGS="${CFLAGS}"
   ./configure --prefix=/usr --disable-static \

Deleted: mpi.patch
===================================================================
--- mpi.patch	2013-05-11 09:27:57 UTC (rev 185118)
+++ mpi.patch	2013-05-11 09:31:07 UTC (rev 185119)
@@ -1,18 +0,0 @@
-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>
-