[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  930d87c1e1a34569620471b2627612d0df6270d0 (commit)
      from  607e77300ead771e2a61a58df3981dad773c8f7a (commit)


- Log -----------------------------------------------------------------
commit 930d87c1e1a34569620471b2627612d0df6270d0
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 f10287e..4a715dc 100755
--- a/Configure
+++ b/Configure
@@ -1516,7 +1516,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 "")