* update hdf5 to 1.14.4.2-6

This commit is contained in:
Alexander Baldeck 2024-06-11 09:41:02 +02:00
parent b62bd0558d
commit 5cfdf7eda0
2 changed files with 8 additions and 31 deletions

View File

@ -1,27 +0,0 @@
diff --git a/src/H5T.c b/src/H5T.c
index 11ef38bce7..1d2230066f 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1643,9 +1643,8 @@ H5T__unlock_cb(void *_dt, hid_t H5_ATTR_UNUSED id, void *_udata)
FUNC_ENTER_PACKAGE_NOERR
assert(dt);
- assert(dt->shared);
- if (H5T_STATE_IMMUTABLE == dt->shared->state) {
+ if (dt->shared && (H5T_STATE_IMMUTABLE == dt->shared->state)) {
dt->shared->state = H5T_STATE_RDONLY;
(*n)++;
} /* end if */
@@ -4202,10 +4201,9 @@ H5T_close(H5T_t *dt)
/* Sanity check */
assert(dt);
- assert(dt->shared);
/* Named datatype cleanups */
- if (dt->shared->state == H5T_STATE_OPEN) {
+ if (dt->shared && (dt->shared->state == H5T_STATE_OPEN)) {
/* Decrement refcount count on open named datatype */
dt->shared->fo_count--;

View File

@ -7,7 +7,7 @@
pkgname=hdf5
pkgver=1.14.4.2
pkgrel=4
pkgrel=6
pkgdesc="General purpose library and file format for storing scientific data"
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
url="https://www.hdfgroup.org/hdf5"
@ -18,16 +18,20 @@ replaces=(hdf5-java)
provides=(hdf5-java)
#source=(https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2)
source=(https://github.com/HDFGroup/hdf5/archive/hdf5_$pkgver/$pkgname-$pkgver.tar.gz
8329ef34.patch)
hdf5-fix-crash-partially-initialized-datatypes.patch
https://github.com/HDFGroup/hdf5/commit/ea760136.patch)
sha256sums=('44c47120e8beeb69f83b2de10203dceb6ef63f253b7859063a60205c8f48ab80'
'0679f3e70b15a644dbb187d1a3375e55f73c9a90e84829d1c5bbab812ffd8376')
'e3b096ac3e401b7af900eb5eacbcd9b7b5d83619bc7e2fad9cf6fa8420acf7c9'
'eac6786aa11e84090ce9b35d0eb3a8054d28d0d22debfe31c65845379325218d')
prepare() {
cd ${pkgname}-${pkgname}_${pkgver/_/-}
# Don't mess with build flags
sed -e '/-Werror/d' -i configure
# Fix segfault in h5py tests
patch -p1 -i ../8329ef34.patch
patch -p1 -i ../hdf5-fix-crash-partially-initialized-datatypes.patch
# Fix operator=
patch -p1 -i ../ea760136.patch
}
build() {