postgres.git / summary / log / commit / refs

commit    81aefaea82934e577e9d81fcb1f809a8d75bbf5c
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed Oct 20 07:48:57 2021 +0000

    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


 src/tools/msvc/Solution.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index cfda5ac1855..eaec9f14bc1 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -547,7 +547,8 @@ sub GenerateFiles
 		my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion();
 
 		# 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_BIO_GET_DATA}          = 1;
@@ -955,7 +956,8 @@ sub AddProject
 		# changed their library names from:
 		# - libeay to libcrypto
 		# - 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 $libsslpath;


[parent: 3ce3fb2f7dc6]