Date: Wednesday, January 17, 2018 @ 13:56:56 Author: archange Revision: 283671
archrelease: copy trunk to community-x86_64 Added: hdf5-openmpi/repos/community-x86_64/PKGBUILD (from rev 283670, hdf5-openmpi/trunk/PKGBUILD) hdf5-openmpi/repos/community-x86_64/mpi.patch (from rev 283670, hdf5-openmpi/trunk/mpi.patch) Deleted: hdf5-openmpi/repos/community-x86_64/PKGBUILD hdf5-openmpi/repos/community-x86_64/mpi.patch -----------+ PKGBUILD | 149 +++++++++++++++++++++++++++++++----------------------------- mpi.patch | 36 +++++++------- 2 files changed, 96 insertions(+), 89 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-17 13:56:39 UTC (rev 283670) +++ PKGBUILD 2018-01-17 13:56:56 UTC (rev 283671) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archa...@archlinux.org> -# Contributor: Stefan Husmann <stefan-husm...@t-online.de> -# Contributor: damir <da...@archlinux.org> -# Contributor: Tom K <t...@runbox.com> -# Contributor: Jed Brown <j...@59a2.org> -# Contributor: Simone Pezzuto <junki....@gmail.com> - -_pkgname=hdf5 -_mpi=openmpi -pkgname=${_pkgname}-${_mpi} -pkgver=1.10.1 -pkgrel=2 -pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version)" -arch=('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-x86_64/PKGBUILD (from rev 283670, hdf5-openmpi/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-17 13:56:56 UTC (rev 283671) @@ -0,0 +1,78 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Maintainer: Bruno Pagani <archa...@archlinux.org> +# Contributor: Stefan Husmann <stefan-husm...@t-online.de> +# Contributor: damir <da...@archlinux.org> +# Contributor: Tom K <t...@runbox.com> +# Contributor: Jed Brown <j...@59a2.org> +# Contributor: Simone Pezzuto <junki....@gmail.com> + +_pkgname=hdf5 +_mpi=openmpi +pkgname=${_pkgname}-${_mpi} +pkgver=1.10.1 +pkgrel=3 +pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version)" +arch=('x86_64') +url="https://www.hdfgroup.org/HDF5/" +license=('custom') +depends=('zlib' 'libaec' '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 \ + --docdir=/usr/share/doc/hdf5/ \ + --disable-static \ + --disable-sharedlib-rpath \ + --enable-build-mode=production \ + --enable-hl \ + --enable-cxx \ + --enable-fortran \ + --enable-parallel \ + --enable-unsupported \ + --with-pic \ + --with-zlib \ + --with-szlib + make +} + +# Check are failing with error while loading shared libraries: libhdf5.so.101: cannot open shared object file: No such file or directory +#check() { +# cd ${pkgname}-${pkgver/_/-} +# make check +#} + +package() { + cd ${_pkgname}-${pkgver/_/-} + + make 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 +} Deleted: mpi.patch =================================================================== --- mpi.patch 2018-01-17 13:56:39 UTC (rev 283670) +++ mpi.patch 2018-01-17 13:56:56 UTC (rev 283671) @@ -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> - Copied: hdf5-openmpi/repos/community-x86_64/mpi.patch (from rev 283670, hdf5-openmpi/trunk/mpi.patch) =================================================================== --- mpi.patch (rev 0) +++ mpi.patch 2018-01-17 13:56:56 UTC (rev 283671) @@ -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> +