[arch-commits] Commit in hdf5-openmpi/repos/community-x86_64 (4 files)
Bruno Pagani
archange at archlinux.org
Mon Oct 22 16:00:25 UTC 2018
Date: Monday, October 22, 2018 @ 16:00:24
Author: archange
Revision: 398410
archrelease: copy trunk to community-x86_64
Added:
hdf5-openmpi/repos/community-x86_64/PKGBUILD
(from rev 398409, hdf5-openmpi/trunk/PKGBUILD)
hdf5-openmpi/repos/community-x86_64/mpi.patch
(from rev 398409, hdf5-openmpi/trunk/mpi.patch)
Deleted:
hdf5-openmpi/repos/community-x86_64/PKGBUILD
hdf5-openmpi/repos/community-x86_64/mpi.patch
-----------+
PKGBUILD | 222 +++++++++++++++++++++++++++++-------------------------------
mpi.patch | 36 ++++-----
2 files changed, 128 insertions(+), 130 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-22 15:58:34 UTC (rev 398409)
+++ PKGBUILD 2018-10-22 16:00:24 UTC (rev 398410)
@@ -1,112 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Bruno Pagani <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.3
-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' 'libaec' 'bash' 'openmpi')
-makedepends=('cmake' 'time' 'gcc-fortran')
-provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
-conflicts=('hdf5')
-replaces=("hdf5-fortran-${_mpi}")
-options=('staticlibs')
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2"
- 'mpi.patch')
-md5sums=('56c5039103c51a40e493b43c504ce982'
- 'dfa8dd50b8a7ebb3ad7249c627156cf9')
-sha256sums=('c65cdcce4724a57fd3f8da9f0d109b497be30092acb9fac634d1291190d905a9'
- '603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
-
-prepare() {
- cd ${_pkgname}-${pkgver/_/-}
- # FS#33343
- patch -p1 -i ../mpi.patch
-}
-
-build() {
- # Crazy workaround: run CMake to generate pkg-config file
- mkdir -p build && cd build
- CXX="mpicxx" \
- CC="mpicc" \
- FC="mpif90" \
- F9X="mpif90" \
- RUNPARALLEL="mpirun" \
- OMPI_MCA_disable_memory_allocator=1 \
- cmake ../${_pkgname}-${pkgver/_/-} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DALLOW_UNSUPPORTED=ON \
- -DHDF5_BUILD_HL_LIB=ON \
- -DHDF5_BUILD_CPP_LIB=ON \
- -DHDF5_BUILD_FORTRAN=ON \
- -DHDF5_ENABLE_PARALLEL=ON \
- -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
- -DHDF5_ENABLE_SZIP_SUPPORT=ON \
- -DHDF5_ENABLE_SZIP_ENCODING=ON
- # But don’t build with it, it’s quite broken
- 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/ \
- --enable-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() {
- cd ${_pkgname}-${pkgver/_/-}
- # Without this, checks are failing with messages like “error while loading shared libraries: libhdf5.so.101: cannot open shared object file: No such file or directory”
- export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
- # This is a parallel build, they are always OpenMPI bugs
- make check || warning "Tests failed"
-}
-
-package() {
- cd ${_pkgname}-${pkgver/_/-}
-
- make DESTDIR="${pkgdir}" install
-
- # Remove leftover test files
- rm "${pkgdir}"/usr/include/tst{ds,image,lite,table}{,_tests}.mod
-
- # Move examples to a proper place
- install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
- mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
-
- install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${_pkgname}
-
- # Install pkg-config files from CMake tree
- install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc -t "${pkgdir}"/usr/lib/pkgconfig/
-}
Copied: hdf5-openmpi/repos/community-x86_64/PKGBUILD (from rev 398409, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-22 16:00:24 UTC (rev 398410)
@@ -0,0 +1,110 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Bruno Pagani <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.4
+pkgrel=1
+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=('cmake' 'time' 'gcc-fortran')
+provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
+conflicts=('hdf5')
+replaces=("hdf5-fortran-${_mpi}")
+options=('staticlibs')
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2"
+ 'mpi.patch')
+sha256sums=('1267ff06aaedc04ca25f7c6026687ea2884b837043431195f153401d942b28df'
+ '603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
+
+prepare() {
+ cd ${_pkgname}-${pkgver/_/-}
+ # FS#33343
+ patch -p1 -i ../mpi.patch
+}
+
+build() {
+ # Crazy workaround: run CMake to generate pkg-config file
+ mkdir -p build && cd build
+ CXX="mpicxx" \
+ CC="mpicc" \
+ FC="mpif90" \
+ F9X="mpif90" \
+ RUNPARALLEL="mpirun" \
+ OMPI_MCA_disable_memory_allocator=1 \
+ cmake ../${_pkgname}-${pkgver/_/-} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DALLOW_UNSUPPORTED=ON \
+ -DHDF5_BUILD_HL_LIB=ON \
+ -DHDF5_BUILD_CPP_LIB=ON \
+ -DHDF5_BUILD_FORTRAN=ON \
+ -DHDF5_ENABLE_PARALLEL=ON \
+ -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
+ -DHDF5_ENABLE_SZIP_SUPPORT=ON \
+ -DHDF5_ENABLE_SZIP_ENCODING=ON
+ # But don’t build with it, it’s quite broken
+ 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/ \
+ --enable-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() {
+ cd ${_pkgname}-${pkgver/_/-}
+ # Without this, checks are failing with messages like “error while loading shared libraries: libhdf5.so.101: cannot open shared object file: No such file or directory”
+ export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
+ # This is a parallel build, they are always OpenMPI bugs
+ make check || warning "Tests failed"
+}
+
+package() {
+ cd ${_pkgname}-${pkgver/_/-}
+
+ make DESTDIR="${pkgdir}" install
+
+ # Remove leftover test files
+ rm "${pkgdir}"/usr/include/tst{ds,image,lite,table}{,_tests}.mod
+
+ # Move examples to a proper place
+ install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
+ mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
+
+ install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${_pkgname}
+
+ # Install pkg-config files from CMake tree
+ install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc -t "${pkgdir}"/usr/lib/pkgconfig/
+}
Deleted: mpi.patch
===================================================================
--- mpi.patch 2018-10-22 15:58:34 UTC (rev 398409)
+++ mpi.patch 2018-10-22 16:00:24 UTC (rev 398410)
@@ -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 398409, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- mpi.patch (rev 0)
+++ mpi.patch 2018-10-22 16:00:24 UTC (rev 398410)
@@ -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