diff options
| author | fhajny <fhajny@pkgsrc.org> | 2016-09-01 10:19:30 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2016-09-01 10:19:30 +0000 |
| commit | 576707c3658783ec0d7af0b1f49da16dfc74a471 (patch) | |
| tree | 36eaf4d0b5cede5c462cbf21c7b6a5c7d177638d /security | |
| parent | a94959470d6064d1925177f5c8197de7fbf8410c (diff) | |
| download | pkgsrc-576707c3658783ec0d7af0b1f49da16dfc74a471.tar.gz | |
Use COMPILER_RPATH_FLAG properly. Reconciles libgcrypt-config with
Darwin linker. Fixes joyent/pkgsrc#400. Bump PKGREVISION.
Diffstat (limited to 'security')
| -rw-r--r-- | security/libgcrypt/Makefile | 9 | ||||
| -rw-r--r-- | security/libgcrypt/distinfo | 4 | ||||
| -rw-r--r-- | security/libgcrypt/patches/patch-aa | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index bd9ea8262ac..88b6af4c734 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.83 2016/08/20 19:22:37 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2016/09/01 10:19:30 fhajny Exp $ DISTNAME= libgcrypt-1.7.3 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \ http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/ @@ -54,6 +55,12 @@ CONFIGURE_ENV+= gcry_cv_gcc_inline_asm_avx=no . endif .endif +SUBST_CLASSES+= rpath +SUBST_FILES.rpath= src/libgcrypt-config.in +SUBST_STAGE.rpath= pre-configure +SUBST_MESSAGE.rpath= Fixing rpath flags +SUBST_VARS.rpath= COMPILER_RPATH_FLAG + .include "options.mk" BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.13 diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo index d22ef83dd6f..75495f87a9a 100644 --- a/security/libgcrypt/distinfo +++ b/security/libgcrypt/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.67 2016/08/17 23:13:11 maya Exp $ +$NetBSD: distinfo,v 1.68 2016/09/01 10:19:30 fhajny Exp $ SHA1 (libgcrypt-1.7.3.tar.bz2) = 5a034291e7248592605db448481478e6c963aa9c RMD160 (libgcrypt-1.7.3.tar.bz2) = 0d3cd1f17572dfaccf098cfaea79d36d6f484418 SHA512 (libgcrypt-1.7.3.tar.bz2) = 55c5704e45167dc5adf1e5a92789a5d841dc27966212cc556abb374e724fddcd85c74b83e0cfa5f3ed2575e3fec9465e8a90d1c5bc8ab1f6697c9abfc2dcaa05 Size (libgcrypt-1.7.3.tar.bz2) = 2861294 bytes -SHA1 (patch-aa) = 3dd44b8745128a6788d24f9eb00002624a5fc52b +SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8 SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518 diff --git a/security/libgcrypt/patches/patch-aa b/security/libgcrypt/patches/patch-aa index 24e63b90d69..f810a3ad231 100644 --- a/security/libgcrypt/patches/patch-aa +++ b/security/libgcrypt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2014/08/21 19:41:38 wiz Exp $ +$NetBSD: patch-aa,v 1.9 2016/09/01 10:19:30 fhajny Exp $ Add rpath to configure script. @@ -9,7 +9,7 @@ Add rpath to configure script. # Set up `libdirs'. if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then - libdirs="-L$libdir" -+ libdirs="-L$libdir -Wl,-R@libdir@" ++ libdirs="-L$libdir @COMPILER_RPATH_FLAG@@libdir@" fi # Set up `libs_final'. |