diff options
| author | Long Huan <8551701+longhuan2018@users.noreply.github.com> | 2021-07-23 04:41:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 13:41:26 -0700 |
| commit | eabb3ffe71f54b1f0f1991bc12b27266b3daad0c (patch) | |
| tree | 1cc156bd5d85d41b9d9227085d159bc60e05932b | |
| parent | 1b1d1b209d45cf3df696f9040fb099a80bec0d84 (diff) | |
| download | vcpkg-eabb3ffe71f54b1f0f1991bc12b27266b3daad0c.tar.gz vcpkg-eabb3ffe71f54b1f0f1991bc12b27266b3daad0c.zip | |
[libpq]fix windows build failure (#19031)
* 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
| -rw-r--r-- | ports/libpq/patches/windows/install.patch | 19 | ||||
| -rw-r--r-- | ports/libpq/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libpq.json | 5 |
4 files changed, 26 insertions, 2 deletions
diff --git a/ports/libpq/patches/windows/install.patch b/ports/libpq/patches/windows/install.patch index 206dd1da0..42713389b 100644 --- a/ports/libpq/patches/windows/install.patch +++ b/ports/libpq/patches/windows/install.patch @@ -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 } }, diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index a96a1f8b5..446b58b2d 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 294592081..510cbe831 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3478,7 +3478,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 17 + "port-version": 18 }, "libpqxx": { "baseline": "7.3.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index cc0946d63..4d0501419 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "03c934a8004ec6c34842748d18c06a38e7a8aa3e", + "version": "12.2", + "port-version": 18 + }, + { "git-tree": "01e2ad37b9df46e45826e52a6cddfb95ca137abd", "version": "12.2", "port-version": 17 |