[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Richard Levitte]

The branch OpenSSL_1_0_1-stable has been updated
       via  126ac21c80967ec00f802d356462c1b83fa0f54c (commit)
      from  51223748e5527db0e08049925bc2e9f430154d97 (commit)


- Log -----------------------------------------------------------------
commit 126ac21c80967ec00f802d356462c1b83fa0f54c
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 19 20:35:41 2016 +0100

    Fix BSD -rpath parameter
    
    For BSD systems, Configure adds a shared_ldflags including a reference
    to the Makefile variable LIBRPATH, but since it must be passed down to
    Makefile.shared, care must be taken so the value of LIBRPATH doesn't
    get expanded too early, or it ends up giving an empty string.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (cherry picked from commit c64879d3f3cc4c7f1c436a9fe3bd109847a23629)

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

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 84f627c..0a5ffac 100755
--- a/Configure
+++ b/Configure
@@ -1449,7 +1449,7 @@ if ($target =~ /\-icc$/)	# Intel C compiler
 # linker only when --prefix is not /usr.
 if ($target =~ /^BSD\-/)
 	{
-	$shared_ldflag.=" -Wl,-rpath,\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|);
+	$shared_ldflag.=" -Wl,-rpath,\$\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|);
 	}
 
 if ($sys_id ne "")