diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-03-02 01:10:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 16:10:04 -0800 |
| commit | 112067db83cd9a4bab80aec8a025af305dbaac5e (patch) | |
| tree | 0316f0a6bc764b8672bcd2d80eb52d9ac298a1e5 /ports/libpq/patches/windows/python3_build_Debug.patch | |
| parent | 80976fc216ef6c8ac418fd99cecaafab85778185 (diff) | |
| download | vcpkg-112067db83cd9a4bab80aec8a025af305dbaac5e.tar.gz vcpkg-112067db83cd9a4bab80aec8a025af305dbaac5e.zip | |
[libpq] fix filenames (linux -> windows cross compile) (#16434)
* [libpq] fix filenames
* add version files
* add version files
Diffstat (limited to 'ports/libpq/patches/windows/python3_build_Debug.patch')
| -rw-r--r-- | ports/libpq/patches/windows/python3_build_Debug.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/ports/libpq/patches/windows/python3_build_Debug.patch b/ports/libpq/patches/windows/python3_build_Debug.patch deleted file mode 100644 index cbc722e0c..000000000 --- a/ports/libpq/patches/windows/python3_build_Debug.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..21b5559d6 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -494,14 +494,15 @@ sub mkvcbuild - - # Attempt to get python version and location. - # Assume python.exe in specified dir. -- my $pythonprog = "import sys;print(sys.prefix);" -- . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -- my $prefixcmd = -- $solution->{options}->{python} . "\\python -c \"$pythonprog\""; -- my $pyout = `$prefixcmd`; -- die "Could not query for python version!\n" if $?; -- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -- -+ #my $pythonprog = "import sys;print(sys.prefix);" -+ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -+ #my $prefixcmd = -+ # $solution->{options}->{python} . "\\python -c \"$pythonprog\""; -+ #my $pyout = `$prefixcmd`; -+ #die "Could not query for python version!\n" if $?; -+ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -+ my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 37; - # 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" -@@ -510,8 +511,9 @@ sub mkvcbuild - my $pymajorver = substr($pyver, 0, 1); - my $plpython = $solution->AddProject('plpython' . $pymajorver, - 'dll', 'PLs', 'src/pl/plpython'); -- $plpython->AddIncludeDir($pyprefix . '/include'); -- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.7'); -+ $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! -+ $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); - $plpython->AddReference($postgres); - - # Add transform modules dependent on plpython |