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

Commitd581960

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 parent1ba3b15 commitd581960

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
@@ -263,7 +263,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
263263
my ($digit1,$digit2,$digit3) =$self->GetOpenSSLVersion();
264264

265265
# More symbols are needed with OpenSSL 1.1.0 and above.
266-
if ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0')
266+
if ( ($digit1 >='3' &&$digit2 >='0' &&$digit3 >='0')
267+
|| ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0'))
267268
{
268269
print O"#define HAVE_ASN1_STRING_GET0_DATA 1\n";
269270
print O"#define HAVE_BIO_GET_DATA 1\n";
@@ -575,7 +576,8 @@ sub AddProject
575576
# changed their library names from:
576577
# - libeay to libcrypto
577578
# - ssleay to libssl
578-
if ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0')
579+
if ( ($digit1 >='3' &&$digit2 >='0' &&$digit3 >='0')
580+
|| ($digit1 >='1' &&$digit2 >='1' &&$digit3 >='0'))
579581
{
580582
my$dbgsuffix;
581583
my$libsslpath;

0 commit comments

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