[openssl] master update

tomas at openssl.org tomas at openssl.org
Fri Aug 27 07:21:39 UTC 2021


The branch master has been updated
       via  597d24e2ab395991cb2048529714ea534c173591 (commit)
      from  c023d98dcf2ba1cc30f545ae54d0e037e80a8794 (commit)


- Log -----------------------------------------------------------------
commit 597d24e2ab395991cb2048529714ea534c173591
Author: Xiaofei Bai <xiaofei.bai at arm.com>
Date:   Wed Aug 18 07:57:26 2021 +0000

    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 at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16393)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/shared-info.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 2b236b4b9b..abf2d98dcc 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',


More information about the openssl-commits mailing list