diff options
| author | sbd <sbd@pkgsrc.org> | 2012-02-18 01:23:59 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-02-18 01:23:59 +0000 |
| commit | 13e3fb07d1ac59459a8add16c3264964189f908b (patch) | |
| tree | 195bab8a3e306c1d017d29338bf8e357900d21e0 | |
| parent | 64e8282a2a0ee5a553e85c94181df1a49ea69b09 (diff) | |
| download | pkgsrc-13e3fb07d1ac59459a8add16c3264964189f908b.tar.gz | |
The compiler rpath flag isn't always '-R', so put a substitutable token in
the patch and replace it using the substitution facility with the pkgsrc
determined flag.
| -rw-r--r-- | security/qca-tls/Makefile | 8 | ||||
| -rw-r--r-- | security/qca-tls/distinfo | 4 | ||||
| -rw-r--r-- | security/qca-tls/patches/patch-aa | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile index 288e79093c3..e36c6405502 100644 --- a/security/qca-tls/Makefile +++ b/security/qca-tls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2011/11/08 15:38:48 gavan Exp $ +# $NetBSD: Makefile,v 1.33 2012/02/18 01:23:59 sbd Exp $ DISTNAME= qca-tls-1.0 PKGREVISION= 10 @@ -22,6 +22,12 @@ CONFIGURE_ARGS+= --with-openssl-lib=${SSLBASE}/lib INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR:Q} +SUBST_CLASSES+= rpath +SUBST_STAGE.rpath= pre-configure +SUBST_MESSAGE.rpath= Substituting compiler RPATH flag. +SUBST_FILES.rpath= configure +SUBST_VARS.rpath= COMPILER_RPATH_FLAG + pre-install: mkdir -p ${DESTDIR}${PREFIX}/qt3/plugins/crypto diff --git a/security/qca-tls/distinfo b/security/qca-tls/distinfo index 82642c31e27..8a6052c9e83 100644 --- a/security/qca-tls/distinfo +++ b/security/qca-tls/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.11 2008/05/25 21:50:45 wiz Exp $ +$NetBSD: distinfo,v 1.12 2012/02/18 01:23:59 sbd Exp $ SHA1 (qca-tls-1.0.tar.bz2) = 775e764c5be342048eba11dae5c5fd3b636d23c5 RMD160 (qca-tls-1.0.tar.bz2) = c553782e77ab54edde7e4f0676a3caad74dfa910 Size (qca-tls-1.0.tar.bz2) = 23489 bytes -SHA1 (patch-aa) = 2c28782e3af7ecffa0b5758f1671c0773bc9af03 +SHA1 (patch-aa) = 84c3e7a4c8254f67a47361094c753f7b38ba852f SHA1 (patch-ab) = 6f17140b26669208b30e1e829816c6ffe9d98b0c diff --git a/security/qca-tls/patches/patch-aa b/security/qca-tls/patches/patch-aa index e99fca36063..39a86730160 100644 --- a/security/qca-tls/patches/patch-aa +++ b/security/qca-tls/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2007/12/23 21:05:51 jdolecek Exp $ +$NetBSD: patch-aa,v 1.6 2012/02/18 01:23:59 sbd Exp $ --- configure.orig 2003-12-17 17:54:50.000000000 -0500 +++ configure @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.5 2007/12/23 21:05:51 jdolecek Exp $ ext += QString("-I") + kbdir + ' '; if(!lib.isEmpty()) - ext += QString("-L") + lib + " -lssl -lcrypto "; -+ ext += QString("-L") + lib + " " + QString("-R") + lib + " -lssl -lcrypto "; ++ ext += QString("-L") + lib + " " + QString("@COMPILER_RPATH_FLAG@") + lib + " -lssl -lcrypto "; int ret; if(!conf->doCompileAndLink(str, ext, &ret)) return false; |