]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix libdir path on darwin
authorXiaofei Bai <xiaofei.bai@arm.com>
Wed, 18 Aug 2021 07:57:26 +0000 (07:57 +0000)
committerTomas Mraz <tomas@openssl.org>
Fri, 27 Aug 2021 07:21:14 +0000 (09:21 +0200)
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)

Configurations/shared-info.pl

index 2b236b4b9be02a504c9ad56372ee21a3fde4c49d..abf2d98dccad82ad833d82d021b9bf164b7507a4 100644 (file)
@@ -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',