Skip to content

Commit

Permalink
[libpq]fix windows build failure (microsoft#19031)
Browse files Browse the repository at this point in the history
* fix windows build failure

fix Could not find debug or release binaries at libpq\x64-windows-rel\src\tools\msvc/Install.pm line 77.

* Update libpq.json
  • Loading branch information
longhuan2018 authored Jul 22, 2021
1 parent 1b1d1b2 commit eabb3ff
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 2 deletions.
19 changes: 19 additions & 0 deletions ports/libpq/patches/windows/install.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index d109b2c90..75c7446e6 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -63,8 +63,16 @@ sub Install
do "./config.pl" if (-f "config.pl");
}

- chdir("../../..") if (-f "../../../configure");
- chdir("../../../..") if (-f "../../../../configure");
+ # Move to the root path depending on the current location.
+ if (-f "../../../configure")
+ {
+ chdir("../../..");
+ }
+ elsif (-f "../../../../configure")
+ {
+ chdir("../../../..");
+ }
+
my $conf = "";
if (-d "debug")
{
@@ -106,7 +106,7 @@ sub Install
}
},
Expand Down
2 changes: 1 addition & 1 deletion ports/libpq/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libpq",
"version": "12.2",
"port-version": 17,
"port-version": 18,
"description": "The official database access API of postgresql",
"homepage": "https://www.postgresql.org/",
"supports": "!uwp",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3478,7 +3478,7 @@
},
"libpq": {
"baseline": "12.2",
"port-version": 17
"port-version": 18
},
"libpqxx": {
"baseline": "7.3.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libpq.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "03c934a8004ec6c34842748d18c06a38e7a8aa3e",
"version": "12.2",
"port-version": 18
},
{
"git-tree": "01e2ad37b9df46e45826e52a6cddfb95ca137abd",
"version": "12.2",
Expand Down

0 comments on commit eabb3ff

Please sign in to comment.