From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Thu, 31 Mar 2022 16:32:29 +0000 (-0600)
Subject: Fix AIX build when no-shared is passed to Configure.
X-Git-Tag: openssl-3.2.0-alpha1~2790
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b83c0a900f9303e0c9fd084829b791386d7c57ce;p=thirdparty%2Fopenssl.git

Fix AIX build when no-shared is passed to Configure.

AIX shared libs are also .a files so the AIX platform staticname()
appends a '_a' to the name to avoid a collision.  However, this
must not be done when no-shared is passed to Configure or the
binaries that link with -lcrypto and -lssl be unable to link as
those libraries won't exist without the '_a' suffix.

CLA: trivial

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18006)
---

diff --git a/Configurations/platform/AIX.pm b/Configurations/platform/AIX.pm
index e2409057cdf..c6c1437f962 100644
--- a/Configurations/platform/AIX.pm
+++ b/Configurations/platform/AIX.pm
@@ -25,5 +25,5 @@ sub staticname {
     return $in_libname
         if $unified_info{attributes}->{libraries}->{$_[1]}->{noinst};
 
-    return platform::BASE->staticname($_[1]) . '_a';
+    return platform::BASE->staticname($_[1]) . ($disabled{shared} ? '' : '_a');
 }