Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit81aefae

Browse files
committed
Fix build of MSVC with OpenSSL 3.0.0
The build scripts of Visual Studio would fail to detect properly a 3.0.0build as the check on the second digit was failing. This is adjustedwhere needed, allowing the builds to complete. Note that the MSIs ofOpenSSL mentioned in the documentation have not changed any librarynames for Win32 and Win64, making this change straight-forward.Reported-by: htalaco, via githubReviewed-by: Daniel GustafssonDiscussion:https://postgr.es/m/YW5XKYkq6k7OtrFq@paquier.xyzBackpatch-through: 9.6
1 parent3ce3fb2 commit81aefae

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

‎src/tools/msvc/Solution.pm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,8 @@ sub GenerateFiles
547547
my ($digit1,$digit2,$digit3) =$self->GetOpenSSLVersion();
548548

549549
# More symbols are needed with OpenSSL 1.1.0 and above.
550-
if ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0')
550+
if ( ($digit1 >='3' &&$digit2 >='0' &&$digit3 >='0')
551+
|| ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0'))
551552
{
552553
$define{HAVE_ASN1_STRING_GET0_DATA} = 1;
553554
$define{HAVE_BIO_GET_DATA} = 1;
@@ -955,7 +956,8 @@ sub AddProject
955956
# changed their library names from:
956957
# - libeay to libcrypto
957958
# - ssleay to libssl
958-
if ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0')
959+
if ( ($digit1 >='3' &&$digit2 >='0' &&$digit3 >='0')
960+
|| ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0'))
959961
{
960962
my$dbgsuffix;
961963
my$libsslpath;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp