1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build of MSVC with OpenSSL 3.0.0

Browse Source 
The build scripts of Visual Studio would fail to detect properly a 3.0.0
build as the check on the second digit was failing.  This is adjusted
where needed, allowing the builds to complete.  Note that the MSIs of
OpenSSL mentioned in the documentation have not changed any library
names for Win32 and Win64, making this change straight-forward.

Reported-by: htalaco, via github
Reviewed-by: Daniel Gustafsson
Discussion: https://postgr.es/m/YW5XKYkq6k7OtrFq@paquier.xyz
Backpatch-through: 9.6
This commit is contained in:
Michael Paquier 2021-10-20 16:48:57 +09:00
parent 3ce3fb2f7d
commit 81aefaea82
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/msvc/Solution.pm
View File

@ -547,7 +547,8 @@ sub GenerateFiles
my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion(); my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion();
# More symbols are needed with OpenSSL 1.1.0 and above. # More symbols are needed with OpenSSL 1.1.0 and above.
if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') if ( ($digit1 >= '3' && $digit2 >= '0' && $digit3 >= '0')
|| ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0'))
{ {
$define{HAVE_ASN1_STRING_GET0_DATA} = 1; $define{HAVE_ASN1_STRING_GET0_DATA} = 1;
$define{HAVE_BIO_GET_DATA} = 1; $define{HAVE_BIO_GET_DATA} = 1;
@ -955,7 +956,8 @@ sub AddProject
# changed their library names from: # changed their library names from:
# - libeay to libcrypto # - libeay to libcrypto
# - ssleay to libssl # - ssleay to libssl
if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') if ( ($digit1 >= '3' && $digit2 >= '0' && $digit3 >= '0')
|| ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0'))
{ {
my $dbgsuffix; my $dbgsuffix;
my $libsslpath; my $libsslpath;