diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-01-28 19:41:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 19:41:44 -0800 |
| commit | 0e3198878b8666812b437eb075f1296b2dff67e8 (patch) | |
| tree | 3984ca274430ee57510b1efd2d9e83c6f9e40308 | |
| parent | 7115ef469d20bf4a3aba3dcfbb38629bcc57ac5b (diff) | |
| download | vcpkg-0e3198878b8666812b437eb075f1296b2dff67e8.tar.gz vcpkg-0e3198878b8666812b437eb075f1296b2dff67e8.zip | |
[libpq] Fix install tool pg_config on Linux (#15748)
* [libpq] Fix install tool pg_config
* update baseline
* [libpq] Use vcpkg_copy_tool_dependencies instead
* update baseline
* [libpq] Fix install tool pg_config
* update baseline
* [libpq] Use vcpkg_copy_tool_dependencies instead
* update baseline
| -rw-r--r-- | ports/libpq/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpq/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libpq.json | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index fa6ea6d91..5d535ff72 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,6 +1,6 @@ Source: libpq Version: 12.2 -Port-Version: 10 +Port-Version: 11 Build-Depends: libpq[core,bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 91f6e3643..427aed5b1 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -297,8 +297,8 @@ else() if(NOT HAS_TOOLS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) else() - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug) endif() set(USE_DL ON) endif() diff --git a/versions/baseline.json b/versions/baseline.json index 407aba67c..8e1b31d6c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3238,7 +3238,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 10 + "port-version": 11 }, "libpqxx": { "baseline": "7.3.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index fca613ba4..a076337a1 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e09ebfc1a310be48ed9f5f3e6d2a648cfddff424", + "version-string": "12.2", + "port-version": 11 + }, + { "git-tree": "7c4dbe4fcb780bed98e6b55ccf039b77c7a5be68", "version-string": "12.2", "port-version": 10 |