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

Felix Yan fyan at archlinux.org
Mon Nov 24 16:08:28 UTC 2014


    Date: Monday, November 24, 2014 @ 17:08:27
  Author: fyan
Revision: 227056

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

Added:
  hdf5-openmpi/repos/staging-i686/
  hdf5-openmpi/repos/staging-i686/PKGBUILD
    (from rev 227055, hdf5-openmpi/trunk/PKGBUILD)
  hdf5-openmpi/repos/staging-i686/mpi.patch
    (from rev 227055, hdf5-openmpi/trunk/mpi.patch)
  hdf5-openmpi/repos/staging-x86_64/
  hdf5-openmpi/repos/staging-x86_64/PKGBUILD
    (from rev 227055, hdf5-openmpi/trunk/PKGBUILD)
  hdf5-openmpi/repos/staging-x86_64/mpi.patch
    (from rev 227055, hdf5-openmpi/trunk/mpi.patch)

--------------------------+
 staging-i686/PKGBUILD    |   69 +++++++++++++++++++++++++++++++++++++++++++++
 staging-i686/mpi.patch   |   18 +++++++++++
 staging-x86_64/PKGBUILD  |   69 +++++++++++++++++++++++++++++++++++++++++++++
 staging-x86_64/mpi.patch |   18 +++++++++++
 4 files changed, 174 insertions(+)

Copied: hdf5-openmpi/repos/staging-i686/PKGBUILD (from rev 227055, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-11-24 16:08:27 UTC (rev 227056)
@@ -0,0 +1,69 @@
+# $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.14
+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) 
+sha1sums=('3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a'
+          '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/staging-i686/mpi.patch (from rev 227055, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- staging-i686/mpi.patch	                        (rev 0)
+++ staging-i686/mpi.patch	2014-11-24 16:08:27 UTC (rev 227056)
@@ -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>
+

Copied: hdf5-openmpi/repos/staging-x86_64/PKGBUILD (from rev 227055, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-11-24 16:08:27 UTC (rev 227056)
@@ -0,0 +1,69 @@
+# $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.14
+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) 
+sha1sums=('3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a'
+          '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/staging-x86_64/mpi.patch (from rev 227055, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- staging-x86_64/mpi.patch	                        (rev 0)
+++ staging-x86_64/mpi.patch	2014-11-24 16:08:27 UTC (rev 227056)
@@ -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