[arch-commits] Commit in hdf5-openmpi/repos (6 files)

Ronald van Haren ronald at nymeria.archlinux.org
Sat May 11 04:52:07 EDT 2013


    Date: Saturday, May 11, 2013 @ 10:52:07
  Author: ronald
Revision: 185114

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  hdf5-openmpi/repos/extra-i686/PKGBUILD
    (from rev 185113, hdf5-openmpi/trunk/PKGBUILD)
  hdf5-openmpi/repos/extra-i686/mpi.patch
    (from rev 185113, hdf5-openmpi/trunk/mpi.patch)
  hdf5-openmpi/repos/extra-x86_64/PKGBUILD
    (from rev 185113, hdf5-openmpi/trunk/PKGBUILD)
  hdf5-openmpi/repos/extra-x86_64/mpi.patch
    (from rev 185113, hdf5-openmpi/trunk/mpi.patch)
Deleted:
  hdf5-openmpi/repos/extra-i686/PKGBUILD
  hdf5-openmpi/repos/extra-x86_64/PKGBUILD

------------------------+
 /PKGBUILD              |  140 +++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD    |   64 ---------------------
 extra-i686/mpi.patch   |   18 ++++++
 extra-x86_64/PKGBUILD  |   64 ---------------------
 extra-x86_64/mpi.patch |   18 ++++++
 5 files changed, 176 insertions(+), 128 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-11 08:51:45 UTC (rev 185113)
+++ extra-i686/PKGBUILD	2013-05-11 08:52:07 UTC (rev 185114)
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Tom K <tomk at runbox.com>
-# Contributor: Jed Brown <jed at 59A2.org>
-# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
-
-pkgname=hdf5-openmpi
-_pkgname=hdf5
-pkgver=1.8.10
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
-url="http://www.hdfgroup.org/HDF5/"
-license=('custom')
-depends=('zlib' 'sh' 'openmpi')
-makedepends=('time')
-provides=('hdf5')
-conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
-options=('!libtool')
-sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
-
-build() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
-  export CFLAGS="${CFLAGS/O2/O0}"
-  export CXXFLAGS="${CFLAGS}"
-  ./configure \
-    CXX="mpicxx" \
-    CC="mpicc" \
-    FC="mpif90" \
-    F9X="mpif90" \
-    RUNPARALLEL="mpirun" \
-    OMPI_MCA_disable_memory_allocator=1 \
-    --prefix=/usr \
-    --with-pthread=/usr/lib/ \
-    --enable-linux-lfs \
-    --enable-unsupported \
-    --enable-shared \
-    --disable-static \
-    --enable-production=yes \
-    --with-zlib \
-    --with-default-api-version=v18 \
-    --enable-parallel=yes \
-    --enable-cxx \
-    --disable-sharedlib-rpath
-
-  make
-}
-
-package() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
-
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d -m755 $pkgdir/usr/share/$_pkgname
-  mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
-
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
-          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
-}
-

Copied: hdf5-openmpi/repos/extra-i686/PKGBUILD (from rev 185113, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-11 08:52:07 UTC (rev 185114)
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Tom K <tomk at runbox.com>
+# Contributor: Jed Brown <jed at 59A2.org>
+# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
+
+pkgname=hdf5-openmpi
+_pkgname=hdf5
+pkgver=1.8.10_patch1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
+url="http://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'sh' 'openmpi')
+makedepends=('time')
+provides=('hdf5')
+conflicts=('hdf5')
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 
+mpi.patch) 
+options=('!libtool')
+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 \
+    CXX="mpicxx" \
+    CC="mpicc" \
+    FC="mpif90" \
+    F9X="mpif90" \
+    RUNPARALLEL="mpirun" \
+    OMPI_MCA_disable_memory_allocator=1 \
+    --prefix=/usr \
+    --with-pthread=/usr/lib/ \
+    --enable-linux-lfs \
+    --enable-unsupported \
+    --enable-shared \
+    --disable-static \
+    --enable-production=yes \
+    --with-zlib \
+    --with-default-api-version=v18 \
+    --enable-parallel=yes \
+    --enable-cxx \
+    --disable-sharedlib-rpath
+
+  make
+}
+
+package() {
+  cd $srcdir/${_pkgname}-${pkgver/_/-}
+
+  make -j1 DESTDIR=${pkgdir} install
+
+  install -d -m755 $pkgdir/usr/share/$_pkgname
+  mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
+
+  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
+  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
+          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+}
+

Copied: hdf5-openmpi/repos/extra-i686/mpi.patch (from rev 185113, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- extra-i686/mpi.patch	                        (rev 0)
+++ extra-i686/mpi.patch	2013-05-11 08:52:07 UTC (rev 185114)
@@ -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>
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-11 08:51:45 UTC (rev 185113)
+++ extra-x86_64/PKGBUILD	2013-05-11 08:52:07 UTC (rev 185114)
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Tom K <tomk at runbox.com>
-# Contributor: Jed Brown <jed at 59A2.org>
-# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
-
-pkgname=hdf5-openmpi
-_pkgname=hdf5
-pkgver=1.8.10
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
-url="http://www.hdfgroup.org/HDF5/"
-license=('custom')
-depends=('zlib' 'sh' 'openmpi')
-makedepends=('time')
-provides=('hdf5')
-conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
-options=('!libtool')
-sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
-
-build() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
-  export CFLAGS="${CFLAGS/O2/O0}"
-  export CXXFLAGS="${CFLAGS}"
-  ./configure \
-    CXX="mpicxx" \
-    CC="mpicc" \
-    FC="mpif90" \
-    F9X="mpif90" \
-    RUNPARALLEL="mpirun" \
-    OMPI_MCA_disable_memory_allocator=1 \
-    --prefix=/usr \
-    --with-pthread=/usr/lib/ \
-    --enable-linux-lfs \
-    --enable-unsupported \
-    --enable-shared \
-    --disable-static \
-    --enable-production=yes \
-    --with-zlib \
-    --with-default-api-version=v18 \
-    --enable-parallel=yes \
-    --enable-cxx \
-    --disable-sharedlib-rpath
-
-  make
-}
-
-package() {
-  cd $srcdir/${_pkgname}-${pkgver/_/-}
-
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d -m755 $pkgdir/usr/share/$_pkgname
-  mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
-
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
-          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
-}
-

Copied: hdf5-openmpi/repos/extra-x86_64/PKGBUILD (from rev 185113, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-11 08:52:07 UTC (rev 185114)
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Tom K <tomk at runbox.com>
+# Contributor: Jed Brown <jed at 59A2.org>
+# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
+
+pkgname=hdf5-openmpi
+_pkgname=hdf5
+pkgver=1.8.10_patch1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
+url="http://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'sh' 'openmpi')
+makedepends=('time')
+provides=('hdf5')
+conflicts=('hdf5')
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 
+mpi.patch) 
+options=('!libtool')
+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 \
+    CXX="mpicxx" \
+    CC="mpicc" \
+    FC="mpif90" \
+    F9X="mpif90" \
+    RUNPARALLEL="mpirun" \
+    OMPI_MCA_disable_memory_allocator=1 \
+    --prefix=/usr \
+    --with-pthread=/usr/lib/ \
+    --enable-linux-lfs \
+    --enable-unsupported \
+    --enable-shared \
+    --disable-static \
+    --enable-production=yes \
+    --with-zlib \
+    --with-default-api-version=v18 \
+    --enable-parallel=yes \
+    --enable-cxx \
+    --disable-sharedlib-rpath
+
+  make
+}
+
+package() {
+  cd $srcdir/${_pkgname}-${pkgver/_/-}
+
+  make -j1 DESTDIR=${pkgdir} install
+
+  install -d -m755 $pkgdir/usr/share/$_pkgname
+  mv $pkgdir/usr/share/{hdf5_examples,$_pkgname/examples}
+
+  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
+  install -m644 $srcdir/${_pkgname}-${pkgver/_/-}/COPYING \
+          $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+}
+

Copied: hdf5-openmpi/repos/extra-x86_64/mpi.patch (from rev 185113, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- extra-x86_64/mpi.patch	                        (rev 0)
+++ extra-x86_64/mpi.patch	2013-05-11 08:52:07 UTC (rev 185114)
@@ -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>
+



More information about the arch-commits mailing list