From: Richard Levitte <levitte@openssl.org>
Date: Mon, 15 May 2023 12:30:43 +0000 (+0200)
Subject: util/mkdef.pl: Take shlib_variant into account
X-Git-Tag: OpenSSL_1_1_1u~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2c6435cd739811def28f6809db0fd068f5cdc60;p=thirdparty%2Fopenssl.git

util/mkdef.pl: Take shlib_variant into account

For platforms using import libraries, the lack of this causes a
disjoint between the name of the DLL that's produced, and the
corresponding import library.

Fixes #20942 (follows up #20732)

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20968)
---

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 3ac79821b02..0599f23f0ba 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -197,6 +197,7 @@ foreach (@ARGV, split(/ /, $config{options}))
 	}
 $libname = $unified_info{sharednames}->{libcrypto} if $do_crypto;
 $libname = $unified_info{sharednames}->{libssl} if $do_ssl;
+$libname .= $target{shlib_variant} || "";
 
 if (!$libname) {
 	if ($do_ssl) {