mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-31 03:57:21 +02:00
Fix build of MSVC with OpenSSL 3.0.0
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:
parent
842fe6123c
commit
abb9ee92c5
@ -521,7 +521,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;
|
||||||
@ -936,7 +937,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;
|
||||||
|
Loading…
Reference in New Issue
Block a user