Skip to content

[libpq] Fix install tool pg_config on Linux #15748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 10 commits into from
Jan 29, 2021
Merged

[libpq] Fix install tool pg_config on Linux #15748

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1a99e6a
[libpq] Fix install tool pg_config
Jan 19, 2021
8f56d77
update baseline
Jan 19, 2021
d3c4c16
[libpq] Use vcpkg_copy_tool_dependencies instead
Jan 20, 2021
20c9b91
update baseline
Jan 20, 2021
47dc4d4
[libpq] Fix install tool pg_config
Jan 19, 2021
85334a5
update baseline
Jan 19, 2021
4ade120
[libpq] Use vcpkg_copy_tool_dependencies instead
Jan 20, 2021
de85c21
update baseline
Jan 20, 2021
a7955fc
Merge branch 'dev/jack/fix_libpq_client' of https://github.com/JackBo…
Jan 22, 2021
5dd61a4
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion port_versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3222,7 +3222,7 @@
},
"libpq": {
"baseline": "12.2",
"port-version": 10
"port-version": 11
},
"libpqxx": {
"baseline": "7.3.0",
Expand Down
5 changes: 5 additions & 0 deletions port_versions/l-/libpq.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "41e7354410722d916bb4d7b42fdb3c23fc4dcd6a",
"version-string": "12.2",
"port-version": 11
},
{
"git-tree": "7c4dbe4fcb780bed98e6b55ccf039b77c7a5be68",
"version-string": "12.2",
Expand Down
2 changes: 1 addition & 1 deletion ports/libpq/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
4 changes: 2 additions & 2 deletions ports/libpq/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_tools(TOOL_NAMES pg_config SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug)
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
endif()
set(USE_DL ON)
endif()
Expand Down