[arch-commits] Commit in hdf5-openmpi/repos (6 files)
Bruno Pagani
archange at archlinux.org
Sat Jun 17 15:04:36 UTC 2017
Date: Saturday, June 17, 2017 @ 15:04:35
Author: archange
Revision: 237934
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
hdf5-openmpi/repos/community-staging-i686/
hdf5-openmpi/repos/community-staging-i686/PKGBUILD
(from rev 237925, hdf5-openmpi/trunk/PKGBUILD)
hdf5-openmpi/repos/community-staging-i686/mpi.patch
(from rev 237925, hdf5-openmpi/trunk/mpi.patch)
hdf5-openmpi/repos/community-staging-x86_64/
hdf5-openmpi/repos/community-staging-x86_64/PKGBUILD
(from rev 237933, hdf5-openmpi/trunk/PKGBUILD)
hdf5-openmpi/repos/community-staging-x86_64/mpi.patch
(from rev 237933, hdf5-openmpi/trunk/mpi.patch)
------------------------------------+
community-staging-i686/PKGBUILD | 71 +++++++++++++++++++++++++++++++++++
community-staging-i686/mpi.patch | 18 ++++++++
community-staging-x86_64/PKGBUILD | 71 +++++++++++++++++++++++++++++++++++
community-staging-x86_64/mpi.patch | 18 ++++++++
4 files changed, 178 insertions(+)
Copied: hdf5-openmpi/repos/community-staging-i686/PKGBUILD (from rev 237925, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-06-17 15:04:35 UTC (rev 237934)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange at 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
+_mpi=openmpi
+pkgname=${_pkgname}-${_mpi}
+pkgver=1.10.1
+pkgrel=1
+pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version)"
+arch=('i686' 'x86_64')
+url="https://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'bash' 'openmpi')
+makedepends=('time' 'gcc-fortran')
+provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
+conflicts=('hdf5')
+replaces=("hdf5-fortran-${_mpi}")
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2"
+ 'mpi.patch')
+md5sums=('d89893c05ee7ea8611b51bb39450d64e'
+ 'dfa8dd50b8a7ebb3ad7249c627156cf9')
+
+prepare() {
+ cd ${_pkgname}-${pkgver/_/-}
+
+ # FS#33343
+ patch -p1 -i ../mpi.patch
+}
+
+build() {
+ cd ${_pkgname}-${pkgver/_/-}
+ ./configure \
+ CXX="mpicxx" \
+ CC="mpicc" \
+ FC="mpif90" \
+ F9X="mpif90" \
+ RUNPARALLEL="mpirun" \
+ OMPI_MCA_disable_memory_allocator=1 \
+ --prefix=/usr \
+ --disable-static \
+ --enable-hl \
+ --enable-build-mode=production \
+ --with-pic \
+ --docdir=/usr/share/doc/hdf5/ \
+ --disable-sharedlib-rpath \
+ --enable-cxx \
+ --enable-fortran \
+ --enable-parallel \
+ --enable-unsupported \
+ --with-zlib
+ make
+}
+
+package() {
+ cd ${_pkgname}-${pkgver/_/-}
+
+ make -j1 DESTDIR="${pkgdir}" install
+
+ rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
+
+ install -dm755 "${pkgdir}"/usr/share/${_pkgname}
+ mv "${pkgdir}"/usr/share/{hdf5_examples,${_pkgname}/examples}
+
+ install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+}
Copied: hdf5-openmpi/repos/community-staging-i686/mpi.patch (from rev 237925, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- community-staging-i686/mpi.patch (rev 0)
+++ community-staging-i686/mpi.patch 2017-06-17 15:04:35 UTC (rev 237934)
@@ -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/community-staging-x86_64/PKGBUILD (from rev 237933, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-06-17 15:04:35 UTC (rev 237934)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange at 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
+_mpi=openmpi
+pkgname=${_pkgname}-${_mpi}
+pkgver=1.10.1
+pkgrel=1
+pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version)"
+arch=('i686' 'x86_64')
+url="https://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'bash' 'openmpi')
+makedepends=('time' 'gcc-fortran')
+provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
+conflicts=('hdf5')
+replaces=("hdf5-fortran-${_mpi}")
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2"
+ 'mpi.patch')
+md5sums=('d89893c05ee7ea8611b51bb39450d64e'
+ 'dfa8dd50b8a7ebb3ad7249c627156cf9')
+
+prepare() {
+ cd ${_pkgname}-${pkgver/_/-}
+
+ # FS#33343
+ patch -p1 -i ../mpi.patch
+}
+
+build() {
+ cd ${_pkgname}-${pkgver/_/-}
+ ./configure \
+ CXX="mpicxx" \
+ CC="mpicc" \
+ FC="mpif90" \
+ F9X="mpif90" \
+ RUNPARALLEL="mpirun" \
+ OMPI_MCA_disable_memory_allocator=1 \
+ --prefix=/usr \
+ --disable-static \
+ --enable-hl \
+ --enable-build-mode=production \
+ --with-pic \
+ --docdir=/usr/share/doc/hdf5/ \
+ --disable-sharedlib-rpath \
+ --enable-cxx \
+ --enable-fortran \
+ --enable-parallel \
+ --enable-unsupported \
+ --with-zlib
+ make
+}
+
+package() {
+ cd ${_pkgname}-${pkgver/_/-}
+
+ make -j1 DESTDIR="${pkgdir}" install
+
+ rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
+
+ install -dm755 "${pkgdir}"/usr/share/${_pkgname}
+ mv "${pkgdir}"/usr/share/{hdf5_examples,${_pkgname}/examples}
+
+ install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+}
Copied: hdf5-openmpi/repos/community-staging-x86_64/mpi.patch (from rev 237933, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- community-staging-x86_64/mpi.patch (rev 0)
+++ community-staging-x86_64/mpi.patch 2017-06-17 15:04:35 UTC (rev 237934)
@@ -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