Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Libpq update and VCPKG_OSX_SYSROOT fix #21583

Merged
merged 4 commits into from
Dec 14, 2021
Merged

Libpq update and VCPKG_OSX_SYSROOT fix #21583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60399e6
[libpq] Update to 12.9
daschuer Nov 21, 2021
8ccc5c1
[libpq] Use VCPKG_OSX_SYSROOT if set
daschuer Nov 21, 2021
bf2c9c4
[libpq] remove comment only chunks from patches
daschuer Dec 14, 2021
7b46bf2
[libpq] update version registry
daschuer Nov 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 20 additions & 83 deletions ports/libpq/patches/windows/Solution_DEBUG.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,115 +2,52 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 51711c2bf..d33fdc3b0 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -650,7 +650,7 @@ sub AddProject
@@ -658,7 +658,7 @@ sub AddProject
if ($self->{options}->{zlib})
{
$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
+ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib');
}
if ($self->{options}->{openssl})
{
@@ -661,7 +661,7 @@ sub AddProject
# changed their library names from:
# - libeay to libcrypto
# - ssleay to libssl
- if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
+ if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
{
my $dbgsuffix;
my $libsslpath;
@@ -670,27 +670,27 @@ sub AddProject
# The format name of the libraries is slightly
# different between the Win32 and Win64 platform, so
# adapt.
- if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
+ if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
{
# Win32 here, with a debugging library set.
$dbgsuffix = 1;
- $libsslpath = '\lib\VC\libssl32.lib';
- $libcryptopath = '\lib\VC\libcrypto32.lib';
+ $libsslpath = '\lib\VC\libssl32.lib'; # This must be updated
+ $libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
}
- elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
+ elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
{
# Win64 here, with a debugging library set.
$dbgsuffix = 1;
- $libsslpath = '\lib\VC\libssl64.lib';
- $libcryptopath = '\lib\VC\libcrypto64.lib';
+ $libsslpath = '\lib\VC\libssl64.lib'; # This must be updated
+ $libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
}
else
{
@@ -698,8 +698,8 @@ sub AddProject
# On both Win32 and Win64 the same library
# names are used without a debugging context.
$dbgsuffix = 0;
- $libsslpath = '\lib\libssl.lib';
- $libcryptopath = '\lib\libcrypto.lib';
+ $libsslpath = '\debug\lib\libssl.lib'; # This must be updated
+ $libcryptopath = '\debug\lib\libcrypto.lib'; # This must be updated
+ $libsslpath = '\debug\lib\libssl.lib';
+ $libcryptopath = '\debug\lib\libcrypto.lib';
}

$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
@@ -698,16 +698,16 @@ sub AddProject
$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
$dbgsuffix);
}
- else
+ else
{
# Choose which set of libraries to use depending on if
# debugging libraries are in place in the installer.
- if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
+ if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
{
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
+ $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
+ $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
}
else
{
@@ -715,60 +715,60 @@ sub AddProject
@@ -715,16 +715,16 @@ sub AddProject
# to be here, so don't ask for it in last
# parameter.
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
+ $self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); # This must be updated
+ $self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0);
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
+ $self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); # This must be updated
+ $self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0);
}
}
}
if ($self->{options}->{nls})
{
$proj->AddIncludeDir($self->{options}->{nls} . '\include');
- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib');
}
if ($self->{options}->{gss})
{
- $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
+ $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); # This must be updated
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
}
@@ -752,39 +752,39 @@ sub AddProject
if ($self->{options}->{iconv})
{
$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib');
}
if ($self->{options}->{icu})
{
Expand All @@ -120,38 +57,38 @@ index 51711c2bf..d33fdc3b0 100644
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib');
}
else
{
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib');
}
}
if ($self->{options}->{xml})
{
$proj->AddIncludeDir($self->{options}->{xml} . '\include');
$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib');
}
if ($self->{options}->{xslt})
{
$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib');
}
if ($self->{options}->{uuid})
{
$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib');
}
return $proj;
}
138 changes: 8 additions & 130 deletions ports/libpq/patches/windows/Solution_RELEASE.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,156 +2,34 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 51711c2bf..d33fdc3b0 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -650,7 +650,7 @@ sub AddProject
@@ -658,7 +658,7 @@ sub AddProject
if ($self->{options}->{zlib})
{
$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
+ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib');
}
if ($self->{options}->{openssl})
{
@@ -661,7 +661,7 @@ sub AddProject
# changed their library names from:
# - libeay to libcrypto
# - ssleay to libssl
- if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
+ if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
{
my $dbgsuffix;
my $libsslpath;
@@ -670,27 +670,27 @@ sub AddProject
# The format name of the libraries is slightly
# different between the Win32 and Win64 platform, so
# adapt.
- if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
+ if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
{
# Win32 here, with a debugging library set.
$dbgsuffix = 1;
- $libsslpath = '\lib\VC\libssl32.lib';
- $libcryptopath = '\lib\VC\libcrypto32.lib';
+ $libsslpath = '\lib\VC\libssl32.lib'; # This must be updated
+ $libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
}
- elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
+ elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
{
# Win64 here, with a debugging library set.
$dbgsuffix = 1;
- $libsslpath = '\lib\VC\libssl64.lib';
- $libcryptopath = '\lib\VC\libcrypto64.lib';
+ $libsslpath = '\lib\VC\libssl64.lib'; # This must be updated
+ $libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
}
else
{
# On both Win32 and Win64 the same library
# names are used without a debugging context.
$dbgsuffix = 0;
- $libsslpath = '\lib\libssl.lib';
- $libcryptopath = '\lib\libcrypto.lib';
+ $libsslpath = '\lib\libssl.lib'; # This must be updated
+ $libcryptopath = '\lib\libcrypto.lib'; # This must be updated
}

$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
@@ -698,16 +698,16 @@ sub AddProject
$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
$dbgsuffix);
}
- else
+ else
{
# Choose which set of libraries to use depending on if
# debugging libraries are in place in the installer.
- if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
+ if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
{
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
+ $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
+ $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
}
else
{
@@ -715,60 +715,60 @@ sub AddProject
# to be here, so don't ask for it in last
# parameter.
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
+ $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); # This must be updated
$proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
+ $self->{options}->{openssl} . '\lib\libeay32.lib', 0); # This must be updated
}
}
}
@@ -724,7 +724,7 @@ sub AddProject
if ($self->{options}->{nls})
{
$proj->AddIncludeDir($self->{options}->{nls} . '\include');
- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib');
}
if ($self->{options}->{gss})
{
- $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
+ $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); # This must be updated
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
}
if ($self->{options}->{iconv})
{
$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated
}
if ($self->{options}->{icu})
{
$proj->AddIncludeDir($self->{options}->{icu} . '\include');
if ($self->{platform} eq 'Win32')
{
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
@@ -765,9 +765,9 @@ sub AddProject
}
else
{
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
}
}
if ($self->{options}->{xml})
{
$proj->AddIncludeDir($self->{options}->{xml} . '\include');
$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
+ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # This must be updated
}
if ($self->{options}->{xslt})
{
$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
+ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # This must be updated
}
if ($self->{options}->{uuid})
{
$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
+ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # This must be updated
}
return $proj;
}
Loading