From 31b3a3afd037b39a8968a134f3d542adf897d448 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 6 Jul 2021 09:06:24 +0200 Subject: [PATCH 1/2] Fix link order in pc file --- ports/hdf5/pkgconfig-link-order.patch | 11 +++++++++++ ports/hdf5/portfile.cmake | 1 + ports/hdf5/vcpkg.json | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 ports/hdf5/pkgconfig-link-order.patch diff --git a/ports/hdf5/pkgconfig-link-order.patch b/ports/hdf5/pkgconfig-link-order.patch new file mode 100644 index 00000000000000..66349c66c9b108 --- /dev/null +++ b/ports/hdf5/pkgconfig-link-order.patch @@ -0,0 +1,11 @@ +diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in +index 4a2ebaa..3cb42d2 100644 +--- a/config/cmake/libhdf5.pc.in ++++ b/config/cmake/libhdf5.pc.in +@@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@ + Requires: @_PKG_CONFIG_REQUIRES@ +-Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@ ++Libs.private: @_PKG_CONFIG_LIBS@ @_PKG_CONFIG_LIBS_PRIVATE@ + Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@ diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 0cd1cb52c1b428..cd85ab359c5dcd 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( szip.patch mingw-import-libs.patch pkgconfig-requires.patch + pkgconfig-link-order.patch ) if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 1cb6985d5b5af7..3912a629ea26c9 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hdf5", "version": "1.12.0", - "port-version": 3, + "port-version": 4, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", From 648f7450da9b02ee4122e1bfe9ee8dd2674e8b82 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 6 Jul 2021 09:07:45 +0200 Subject: [PATCH 2/2] x-add-version --- versions/baseline.json | 2 +- versions/h-/hdf5.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index a200b7aee8824e..2ea8afc6047d7c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2478,7 +2478,7 @@ }, "hdf5": { "baseline": "1.12.0", - "port-version": 3 + "port-version": 4 }, "healpix": { "baseline": "1.12.10", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 72096684eb9a7c..0440a7f6fd933e 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77eb81be380363280c67a3b15043696f6cee2001", + "version": "1.12.0", + "port-version": 4 + }, { "git-tree": "0a7e8bbf885fa0b111c3041102cb2c9adb45f5c3", "version": "1.12.0",