mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:19:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libpq] fix python patches (#15579)

Browse Source 
* [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>
This commit is contained in:
Alexander Neumann 2021-04-29 06:30:37 +02:00 committed by GitHub
parent b23a4a7516
commit 326eabc191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/libpq/patches/windows/python3_build_DEBUG.patch
View File

@ -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);

4
ports/libpq/patches/windows/python3_build_RELEASE.patch
View File

@ -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);

1
ports/libpq/portfile.cmake
View File

@ -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})

2
ports/libpq/vcpkg.json
View File

@ -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",

2
versions/baseline.json
View File

@ -3390,7 +3390,7 @@
},
"libpq": {
"baseline": "12.2",
"port-version": 14
"port-version": 15
},
"libpqxx": {
"baseline": "7.3.1",

5
versions/l-/libpq.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0108a2846402c326800b0da2ffc9d67daad9fbdb",
"version": "12.2",
"port-version": 15
},
{
"git-tree": "212f71f4fc5edf570dece0822c7d9863dbe0c90c",
"version": "12.2",