Skip to content
Snippets Groups Projects
Verified Commit 6fb7d57d authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Windows package: bump HDF5 dependency

As a consequence, drop workaround for https://github.com/msys2/MINGW-packages/issues/22712
parent a1f2fc18
Branches
No related tags found
No related merge requests found
......@@ -149,8 +149,6 @@ lib64-msys2: tarballs/mingw-w64-x86_64-boost-$(MINGW64_BOOST_VERSION)-any.pkg.ta
rm -rf $@
mkdir $@
for f in $^; do tar xf $$f --directory $@ $(MSYS2_EXCLUDES); done
# Workaround for https://github.com/msys2/MINGW-packages/issues/22712
patch -d lib64-msys2/mingw64/lib/pkgconfig/ < hdf5.pc.patch
touch $@
mingw64: tarballs/mingw-w64-x86_64-gcc-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gcc-libs-$(MINGW64_GCC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-gmp-$(MINGW64_GMP_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-binutils-$(MINGW64_BINUTILS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-headers-git-$(MINGW64_HEADERS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-crt-git-$(MINGW64_CRT_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-winpthreads-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libwinpthread-git-$(MINGW64_WINPTHREADS_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zlib-$(MINGW64_ZLIB_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-zstd-$(MINGW64_ZSTD_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-isl-$(MINGW64_ISL_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpc-$(MINGW64_MPC_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-mpfr-$(MINGW64_MPFR_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-libiconv-$(MINGW64_LIBICONV_VERSION)-any.pkg.tar.zst tarballs/mingw-w64-x86_64-windows-default-manifest-$(MINGW64_WINDOWS_DEFAULT_MANIFEST_VERSION)-any.pkg.tar.zst
......
--- hdf5.pc~ 2024-10-30 08:57:30.000000000 +0100
+++ hdf5.pc 2024-12-03 14:38:44.633291490 +0100
@@ -10,5 +10,5 @@
Cflags: -I${includedir}
Libs: -L${libdir} -lhdf5
Requires:
-Libs.private: -lzlib-static
-Requires.private: libcrypto libssl libcurl
+Libs.private:
+Requires.private: libcrypto libssl libcurl zlib
......@@ -33,7 +33,7 @@ MINGW64_ZLIB_VERSION = 1.3.1-1
# Dependency of matio
# pacman -Ss mingw-w64-x86_64-hdf5
MINGW64_HDF5_VERSION = 1.14.5-1
MINGW64_HDF5_VERSION = 1.14.5-2
# Dependency of HDF5 (provides szip library)
# pacman -Ss mingw-w64-x86_64-libaec
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment