From 47d7334224d774c42713fb8953a0b778415fa251 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 16 Jun 2014 13:35:29 +0200 Subject: [PATCH] hooks/script-wrapper: create gpg-error-config wrapper. --- common/hooks/pre-configure/02-script-wrapper.sh | 7 ++++--- common/shlibs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index 3da445feb36..e5c1739fa8d 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -16,7 +16,7 @@ generic_wrapper() { } generic_wrapper2() { - local wrapper="$1" incdir="$2" + local wrapper="$1" [ ! -x ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ] && return 0 [ -x ${WRAPPERDIR}/${wrapper} ] && return 0 @@ -49,8 +49,9 @@ hook() { generic_wrapper sdl-config generic_wrapper sdl2-config generic_wrapper gpgme-config - generic_wrapper2 libpng-config libpng16 - generic_wrapper2 ncurses5-config ncurses + generic_wrapper2 gpg-error-config + generic_wrapper2 libpng-config + generic_wrapper2 ncurses5-config export PATH=${WRAPPERDIR}:$PATH } diff --git a/common/shlibs b/common/shlibs index 3e9e8b741f4..0c9c906dd0e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -218,7 +218,7 @@ libpopt.so.0 popt-1.15_1 libtasn1.so.6 libtasn1-3.2_1 libgpg-error.so.0 libgpg-error-1.6_1 liblzo2.so.2 lzo-2.03_1 -libgcrypt.so.11 libgcrypt-1.4.4_1 +libgcrypt.so.20 libgcrypt-1.6.1_1 libgnutls.so.28 gnutls-3.1.5_1 libgnutlsxx.so.28 gnutls-3.2.13_1 libgnutls-openssl.so.27 gnutls-3.1.5_1