From c3921a248227c3258a46cb15f91136ff99aba53c Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Sun, 4 Sep 2022 11:26:02 +0200 Subject: [PATCH 1/3] [HDF5] Also include dll.a in the output on Windows As it might make #5383 build on Windows --- H/HDF5/build_tarballs.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/H/HDF5/build_tarballs.jl b/H/HDF5/build_tarballs.jl index 60040bafdd3..444c0bdbe16 100644 --- a/H/HDF5/build_tarballs.jl +++ b/H/HDF5/build_tarballs.jl @@ -2,7 +2,7 @@ using BinaryBuilder # Collection of sources required to build HDF5 name = "HDF5" -version = v"1.12.2" +version = v"1.12.2000" sources = [ # 32-bit Windows from https://packages.msys2.org/package/mingw-w64-i686-hdf5 @@ -37,7 +37,10 @@ mkdir -p ${libdir} ${includedir} if [[ ${target} == *mingw* ]]; then cd ${target}/mingw${nbits} + rm -f lib/{*_cpp*,*fortran*,*f90*} # we do not need these rm -f bin/{*_cpp*,*fortran*,*f90*} # we do not need these + + mv -v lib/libhdf5*.dll.a ${libdir} mv -v bin/*.dll ${libdir} mv -v include/* ${includedir} From c6faac3c4e8a984742f36fdd4c7215bb14c60c45 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Sun, 4 Sep 2022 11:47:25 +0200 Subject: [PATCH 2/3] Update build_tarballs.jl --- H/HDF5/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/H/HDF5/build_tarballs.jl b/H/HDF5/build_tarballs.jl index 444c0bdbe16..c30138738d2 100644 --- a/H/HDF5/build_tarballs.jl +++ b/H/HDF5/build_tarballs.jl @@ -2,7 +2,7 @@ using BinaryBuilder # Collection of sources required to build HDF5 name = "HDF5" -version = v"1.12.2000" +version = v"1.12.2" sources = [ # 32-bit Windows from https://packages.msys2.org/package/mingw-w64-i686-hdf5 From 1257e1a0938089e569b18eb75f6dd3e906669f73 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Sun, 4 Sep 2022 13:34:45 +0200 Subject: [PATCH 3/3] Update build_tarballs.jl --- H/HDF5/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/H/HDF5/build_tarballs.jl b/H/HDF5/build_tarballs.jl index c30138738d2..29df485fe46 100644 --- a/H/HDF5/build_tarballs.jl +++ b/H/HDF5/build_tarballs.jl @@ -40,7 +40,7 @@ if [[ ${target} == *mingw* ]]; then rm -f lib/{*_cpp*,*fortran*,*f90*} # we do not need these rm -f bin/{*_cpp*,*fortran*,*f90*} # we do not need these - mv -v lib/libhdf5*.dll.a ${libdir} + mv -v lib/libhdf5*.dll.a ${prefix}/lib mv -v bin/*.dll ${libdir} mv -v include/* ${includedir}