diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-07-06 22:34:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 13:34:41 -0700 |
| commit | 1d39c6f24680dc2f82de7c0b5f1923b19f25aa55 (patch) | |
| tree | f0a0c59f6aca4be260f377c91ffb34d4a4cb2dac | |
| parent | a6cefc0e224e4a284351dc33db5e7afe85d2aa46 (diff) | |
| download | vcpkg-1d39c6f24680dc2f82de7c0b5f1923b19f25aa55.tar.gz vcpkg-1d39c6f24680dc2f82de7c0b5f1923b19f25aa55.zip | |
[hdf5] Fix linking order in pc file (#18825)
* Fix link order in pc file
* x-add-version
| -rw-r--r-- | ports/hdf5/pkgconfig-link-order.patch | 11 | ||||
| -rw-r--r-- | ports/hdf5/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/hdf5/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/h-/hdf5.json | 5 |
5 files changed, 19 insertions, 2 deletions
diff --git a/ports/hdf5/pkgconfig-link-order.patch b/ports/hdf5/pkgconfig-link-order.patch new file mode 100644 index 000000000..66349c66c --- /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 0cd1cb52c..cd85ab359 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 1cb6985d5..3912a629e 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", diff --git a/versions/baseline.json b/versions/baseline.json index 1a73714f9..2736fa9db 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 72096684e..0440a7f6f 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "77eb81be380363280c67a3b15043696f6cee2001", + "version": "1.12.0", + "port-version": 4 + }, + { "git-tree": "0a7e8bbf885fa0b111c3041102cb2c9adb45f5c3", "version": "1.12.0", "port-version": 3 |