[pkgsrc/trunk]: pkgsrc/www/aws www/aws: Link aws tools with runpath to libssl

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f4cf55635ff
branches:  trunk
changeset: 634156:6f4cf55635ff
user:      marino <marino%pkgsrc.org@localhost>
date:      Fri May 09 23:58:21 2014 +0000

description:
www/aws: Link aws tools with runpath to libssl

The aws tools were linked to libssl without rpath.  If libssl is not
located in a standard library search path, the rtld will not be able
to find it (as seen on Joyent dev area).

This change links the libssl runpath to the tools.

diffstat:

 www/aws/Makefile                      |  10 ++++++----
 www/aws/distinfo                      |   3 ++-
 www/aws/patches/patch-tools_tools.gpr |  22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r b13a6fc15f9f -r 6f4cf55635ff www/aws/Makefile
--- a/www/aws/Makefile  Fri May 09 22:45:15 2014 +0000
+++ b/www/aws/Makefile  Fri May 09 23:58:21 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2014/05/09 22:45:15 marino Exp $
+# $NetBSD: Makefile,v 1.18 2014/05/09 23:58:21 marino Exp $
 #
 
 DISTNAME=      aws-${AWS_VERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    www
 MASTER_SITES=  http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=  .tar.bz2
@@ -40,9 +40,11 @@
 SUBST_STAGE.rpath=     pre-configure
 SUBST_MESSAGE.rpath=   Adjust rpaths of shared libraries
 SUBST_FILES.rpath=     src/src.gpr include/include.gpr \
-                       demos/test_ldap/test_ldap.gpr
+                       demos/test_ldap/test_ldap.gpr tools/tools.gpr
 SUBST_SED.rpath=       -e "s,@ADDITIONAL_RPATH@,${ADDITIONAL_RPATH}," \
-                       -e "s,@PREFIX@,${PREFIX},g"
+                       -e "s,@PREFIX@,${PREFIX},g" \
+                       -e "s,@RFLAG@,${LINKER_RPATH_FLAG},g" \
+                       -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g"
 ADDITIONAL_RPATH=      ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable
 
 GENERATE_PLIST=  cd ${DESTDIR}${PREFIX};
diff -r b13a6fc15f9f -r 6f4cf55635ff www/aws/distinfo
--- a/www/aws/distinfo  Fri May 09 22:45:15 2014 +0000
+++ b/www/aws/distinfo  Fri May 09 23:58:21 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2014/05/09 22:45:15 marino Exp $
+$NetBSD: distinfo,v 1.9 2014/05/09 23:58:21 marino Exp $
 
 SHA1 (aws-3.1.0.0.tar.bz2) = a8135b10bad5a751840858acb305cbb01b5558db
 RMD160 (aws-3.1.0.0.tar.bz2) = d7c8dc904a0a91a8754aae8d07eb8b015fbf3b1f
@@ -16,3 +16,4 @@
 SHA1 (patch-ssl_ssl.gpr) = c605957c0c77b90ba82573a230e1cec52d9cceae
 SHA1 (patch-templates_parser__docs__gentexifile) = d9019f7ee865d38e3cf3f4fb08d942e1a6bb1367
 SHA1 (patch-templates_parser__docs__makefile) = a26ea46580397c06c7a1148cdf9be44545bb124e
+SHA1 (patch-tools_tools.gpr) = ba3d53000cce5fbf0b1a41cd4fb3d515cc7cd38f
diff -r b13a6fc15f9f -r 6f4cf55635ff www/aws/patches/patch-tools_tools.gpr
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/aws/patches/patch-tools_tools.gpr     Fri May 09 23:58:21 2014 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-tools_tools.gpr,v 1.1 2014/05/09 23:58:21 marino Exp $
+
+ Establish runpath to libssl for aws tools
+
+--- tools/tools.gpr.orig       2013-07-03 01:11:54.000000000 +0000
++++ tools/tools.gpr
+@@ -98,11 +98,13 @@ project Tools is
+ 
+    package Linker is
+ 
++      linx := ("@RFLAG@", "@SSL_RPATH@");
++
+       case Shared.Build is
+          when "Release" =>
+-            for Default_Switches ("Ada") use ("-s");
++            for Default_Switches ("Ada") use ("-s") & linx;
+          when others =>
+-            null;
++            for Default_Switches ("Ada") use linx;
+       end case;
+ 
+       case Shared.S_Target is