diff options
| -rw-r--r-- | www/aws/Makefile | 10 | ||||
| -rw-r--r-- | www/aws/distinfo | 3 | ||||
| -rw-r--r-- | www/aws/patches/patch-tools_tools.gpr | 22 |
3 files changed, 30 insertions, 5 deletions
diff --git a/www/aws/Makefile b/www/aws/Makefile index 8ef084a43df..aba9fcaba28 100644 --- a/www/aws/Makefile +++ b/www/aws/Makefile @@ -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_CLASSES+= rpath 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 --git a/www/aws/distinfo b/www/aws/distinfo index bd176341a14..d4045935923 100644 --- a/www/aws/distinfo +++ b/www/aws/distinfo @@ -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__crypto_lib.gpr) = e6624d49c72e3dea73ad2b66044f0da5e7ef0a99 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 --git a/www/aws/patches/patch-tools_tools.gpr b/www/aws/patches/patch-tools_tools.gpr new file mode 100644 index 00000000000..1e4433feed1 --- /dev/null +++ b/www/aws/patches/patch-tools_tools.gpr @@ -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 |