diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-04-29 06:30:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 21:30:37 -0700 |
| commit | 326eabc1917c45d24ee71044cf98b9d1b051cbc6 (patch) | |
| tree | 0b17f24152f74519170d5f013ec31045d6118a94 | |
| parent | b23a4a75169c6cc8b2b92624445bf1e2bfe3f8ec (diff) | |
| download | vcpkg-326eabc1917c45d24ee71044cf98b9d1b051cbc6.tar.gz vcpkg-326eabc1917c45d24ee71044cf98b9d1b051cbc6.zip | |
[libpq] fix python patches (#15579)
* [libpq] fix python patches
* [libpq] Bump port-version and add comment about python patches
* Bump port-version
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/libpq/patches/windows/python3_build_DEBUG.patch | 4 | ||||
| -rw-r--r-- | ports/libpq/patches/windows/python3_build_RELEASE.patch | 4 | ||||
| -rw-r--r-- | ports/libpq/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/libpq/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libpq.json | 5 |
6 files changed, 12 insertions, 6 deletions
diff --git a/ports/libpq/patches/windows/python3_build_DEBUG.patch b/ports/libpq/patches/windows/python3_build_DEBUG.patch index cbc722e0c..fb267e9df 100644 --- a/ports/libpq/patches/windows/python3_build_DEBUG.patch +++ b/ports/libpq/patches/windows/python3_build_DEBUG.patch @@ -22,7 +22,7 @@ index 99f39caa5..21b5559d6 100644 + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 37; ++ my $pyver = 39; # Sometimes (always?) if python is not present, the execution # appears to work, but gives no data... die "Failed to query python for version information\n" @@ -32,7 +32,7 @@ index 99f39caa5..21b5559d6 100644 'dll', 'PLs', 'src/pl/plpython'); - $plpython->AddIncludeDir($pyprefix . '/include'); - $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.7'); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.9'); + $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! + $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); $plpython->AddReference($postgres); diff --git a/ports/libpq/patches/windows/python3_build_RELEASE.patch b/ports/libpq/patches/windows/python3_build_RELEASE.patch index 5ac42cfc7..b89e435e4 100644 --- a/ports/libpq/patches/windows/python3_build_RELEASE.patch +++ b/ports/libpq/patches/windows/python3_build_RELEASE.patch @@ -22,7 +22,7 @@ index 99f39caa5..21b5559d6 100644 + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 37; ++ my $pyver = 39; # Sometimes (always?) if python is not present, the execution # appears to work, but gives no data... die "Failed to query python for version information\n" @@ -32,7 +32,7 @@ index 99f39caa5..21b5559d6 100644 'dll', 'PLs', 'src/pl/plpython'); - $plpython->AddIncludeDir($pyprefix . '/include'); - $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.7'); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.9'); + $plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib"); $plpython->AddReference($postgres); diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 3a59d4de8..681841bc3 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,4 +1,5 @@ set(PORT_VERSION 12.2) +# NOTE: the python patches must be regenerated on version update macro(feature_unsupported) foreach(_feat ${ARGN}) diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index a1f8e736a..69045c324 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "12.2", - "port-version": 14, + "port-version": 15, "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 887c8a742..af1251abb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3390,7 +3390,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 14 + "port-version": 15 }, "libpqxx": { "baseline": "7.3.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 517df834e..169c49c10 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0108a2846402c326800b0da2ffc9d67daad9fbdb", + "version": "12.2", + "port-version": 15 + }, + { "git-tree": "212f71f4fc5edf570dece0822c7d9863dbe0c90c", "version": "12.2", "port-version": 14 |