[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD hdf5-1.12.0-compat-1.6.patch)
Bruno Pagani
archange at gemini.archlinux.org
Wed Jul 21 17:48:33 UTC 2021
Date: Wednesday, July 21, 2021 @ 17:48:33
Author: archange
Revision: 982505
upgpkg: hdf5-openmpi 1.12.1-1
Modified:
hdf5-openmpi/trunk/PKGBUILD
Deleted:
hdf5-openmpi/trunk/hdf5-1.12.0-compat-1.6.patch
------------------------------+
PKGBUILD | 36 +++++++---------
hdf5-1.12.0-compat-1.6.patch | 89 -----------------------------------------
2 files changed, 17 insertions(+), 108 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-21 17:48:03 UTC (rev 982504)
+++ PKGBUILD 2021-07-21 17:48:33 UTC (rev 982505)
@@ -9,25 +9,23 @@
_pkgname=hdf5
_mpi=openmpi
pkgname=${_pkgname}-${_mpi}
-pkgver=1.12.0
-pkgrel=2
+pkgver=1.12.1
+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 ${_mpi})
-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"
- hdf5-1.12.0-compat-1.6.patch)
-sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61'
- '72ad497c56760bb3af8193c88d3fa264125829850b843697de55d934c56f7f44')
+makedepends=(cmake time gcc-fortran java-environment)
+provides=(hdf5 hdf5-${_mpi}-java)
+conflicts=(hdf5 hdf5-${_mpi}-java)
+replaces=(hdf5-${_mpi}-java)
+source=(https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
+sha256sums=('aaf9f532b3eda83d3d3adc9f8b40a9b763152218fa45349c3bc77502ca1f8f1c')
build() {
# Crazy workaround: run CMake to generate pkg-config file
+ #cmake -B build -S ${pkgname}-${pkgver/_/-} \
mkdir -p build && cd build
CXX="mpicxx" \
CC="mpicc" \
@@ -37,16 +35,18 @@
OMPI_MCA_disable_memory_allocator=1 \
cmake ../${_pkgname}-${pkgver/_/-} \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=ON \
+ -DBUILD_STATIC_LIBS=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DALLOW_UNSUPPORTED=ON \
-DHDF5_BUILD_HL_LIB=ON \
-DHDF5_BUILD_CPP_LIB=ON \
-DHDF5_BUILD_FORTRAN=ON \
+ -DHDF5_BUILD_JAVA=ON \
-DHDF5_ENABLE_PARALLEL=ON \
-DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
-DHDF5_ENABLE_SZIP_SUPPORT=ON \
- -DHDF5_ENABLE_SZIP_ENCODING=ON
+ -DHDF5_ENABLE_SZIP_ENCODING=ON \
+ -DUSE_LIBAEC=ON
# But don’t build with it, it’s quite broken
cd ../${_pkgname}-${pkgver/_/-}
./configure \
@@ -58,13 +58,14 @@
OMPI_MCA_disable_memory_allocator=1 \
--prefix=/usr \
--docdir=/usr/share/doc/hdf5/ \
- --with-examplesdir='${DESTDIR}/${prefix}/share/doc/hdf5/examples' \
- --enable-static \
+ --with-examplesdir=/usr/share/doc/hdf5/examples/ \
+ --disable-static \
--disable-sharedlib-rpath \
--enable-build-mode=production \
--enable-hl \
--enable-cxx \
--enable-fortran \
+ --enable-java \
--enable-parallel \
--enable-unsupported \
--with-pic \
@@ -91,8 +92,5 @@
make DESTDIR="${pkgdir}" install
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/
- # Fix 1.6 compatibility for h5py
- cd "${pkgdir}"/usr/include/
- patch -p1 -i "${srcdir}"/hdf5-1.12.0-compat-1.6.patch
+ install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp,_fortran}.pc -t "${pkgdir}"/usr/lib/pkgconfig/
}
Deleted: hdf5-1.12.0-compat-1.6.patch
===================================================================
--- hdf5-1.12.0-compat-1.6.patch 2021-07-21 17:48:03 UTC (rev 982504)
+++ hdf5-1.12.0-compat-1.6.patch 2021-07-21 17:48:33 UTC (rev 982505)
@@ -1,89 +0,0 @@
---- a/H5version.h
-+++ b/H5version.h
-@@ -97,6 +97,10 @@
- #define H5Ewalk_vers 1
- #endif /* !defined(H5Ewalk_vers) */
-
-+#if !defined(H5Fget_info_vers)
-+ #define H5Fget_info_vers 1
-+#endif /* !defined(H5Fget_info_vers) */
-+
- #if !defined(H5Gcreate_vers)
- #define H5Gcreate_vers 1
- #endif /* !defined(H5Gcreate_vers) */
-@@ -105,6 +109,38 @@
- #define H5Gopen_vers 1
- #endif /* !defined(H5Gopen_vers) */
-
-+#if !defined(H5Lget_info_vers)
-+ #define H5Lget_info_vers 1
-+#endif /* !defined(H5Lget_info_vers) */
-+
-+#if !defined(H5Lget_info_by_idx_vers)
-+ #define H5Lget_info_by_idx_vers 1
-+#endif /* !defined(H5Lget_info_by_idx_vers) */
-+
-+#if !defined(H5Oget_info_vers)
-+ #define H5Oget_info_vers 1
-+#endif /* !defined(H5Oget_info_vers) */
-+
-+#if !defined(H5Oget_info_by_idx_vers)
-+ #define H5Oget_info_by_idx_vers 1
-+#endif /* !defined(H5Oget_info_by_idx_vers) */
-+
-+#if !defined(H5Oget_info_by_name_vers)
-+ #define H5Oget_info_by_name_vers 1
-+#endif /* !defined(H5Oget_info_by_name_vers) */
-+
-+#if !defined(H5Ovisit_vers)
-+ #define H5Ovisit_vers 1
-+#endif /* !defined(H5Ovisit_vers) */
-+
-+#if !defined(H5Ovisit_by_name_vers)
-+ #define H5Ovisit_by_name_vers 1
-+#endif /* !defined(H5Ovisit_by_name_vers) */
-+
-+#if !defined(H5Pencode_vers)
-+ #define H5Pencode_vers 1
-+#endif /* !defined(H5Pencode_vers) */
-+
- #if !defined(H5Pget_filter_vers)
- #define H5Pget_filter_vers 1
- #endif /* !defined(H5Pget_filter_vers) */
-@@ -133,6 +169,10 @@
- #define H5Tarray_create_vers 1
- #endif /* !defined(H5Tarray_create_vers) */
-
-+#if !defined(H5Sencode_vers)
-+ #define H5Sencode_vers 1
-+#endif /* !defined(H5Sencode_vers) */
-+
- #if !defined(H5Tcommit_vers)
- #define H5Tcommit_vers 1
- #endif /* !defined(H5Tcommit_vers) */
-@@ -153,6 +193,14 @@
- #define H5E_auto_t_vers 1
- #endif /* !defined(H5E_auto_t_vers) */
-
-+#if !defined(H5O_info_t_vers)
-+ #define H5O_info_t_vers 1
-+#endif /* !defined(H5O_info_t_vers) */
-+
-+#if !defined(H5O_iterate_t_vers)
-+ #define H5O_iterate_t_vers 1
-+#endif /* !defined(H5O_iterate_t_vers) */
-+
- #if !defined(H5Z_class_t_vers)
- #define H5Z_class_t_vers 1
- #endif /* !defined(H5Z_class_t_vers) */
-@@ -261,6 +309,10 @@
- #define H5Ovisit_by_name_vers 1
- #endif /* !defined(H5Ovisit_by_name_vers) */
-
-+#if !defined(H5Pencode_vers)
-+ #define H5Pencode_vers 1
-+#endif /* !defined(H5Pencode_vers) */
-+
- #if !defined(H5Pget_filter_vers)
- #define H5Pget_filter_vers 2
- #endif /* !defined(H5Pget_filter_vers) */
More information about the arch-commits
mailing list