From: Xiaofei Bai <xiaofei.bai@arm.com>
Date: Wed, 18 Aug 2021 07:57:26 +0000 (+0000)
Subject: Fix libdir path on darwin
X-Git-Tag: openssl-3.0.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=597d24e2ab395991cb2048529714ea534c173591;p=thirdparty%2Fopenssl.git

Fix libdir path on darwin

In current Configure script, libdir can be specified either an absolute
path or relative, while in Configurations/shared-info.pl, on darwin
system "-install_name" only accepts relative libdir path, and the
program fails when receiving absolute libdir path. This PR is to fix
this and match requirements of scripts.

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

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 2b236b4b9be..abf2d98dcca 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -43,7 +43,7 @@ my %shared_info;
     'darwin-shared' => {
         module_ldflags        => '-bundle',
         shared_ldflag         => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)',
-        shared_sonameflag     => '-install_name $(INSTALLTOP)/$(LIBDIR)/',
+        shared_sonameflag     => '-install_name $(libdir)/',
     },
     'cygwin-shared' => {
         shared_ldflag         => '-shared -Wl,--enable-auto-image-base',