From ffb0ebe230f6a99a478da7ba2a06dc43138a283e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 13 May 2014 10:42:47 +0200 Subject: [PATCH] hooks/script-wrapper: create freetype-config wrapper; simplify code. --- .../hooks/pre-configure/02-script-wrapper.sh | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index 1a3758a7e43..b6f4fd5df9c 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -5,20 +5,13 @@ WRAPPERDIR="${wrksrc}/.xbps/bin" -icu_config_wrapper() { - [ ! -x ${XBPS_CROSS_BASE}/usr/bin/icu-config ] && return 0 +generic_wrapper() { + local wrapper="$1" + [ ! -x ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ] && return 0 - echo "#!/bin/sh" >> ${WRAPPERDIR}/icu-config - echo "exec ${XBPS_CROSS_BASE}/usr/bin/icu-config --prefix=${XBPS_CROSS_BASE}/usr \"\$@\"" >> ${WRAPPERDIR}/icu-config - chmod 755 ${WRAPPERDIR}/icu-config -} - -libgcrypt_config_wrapper() { - [ ! -x ${XBPS_CROSS_BASE}/usr/bin/libgcrypt-config ] && return 0 - - echo "#!/bin/sh" >> ${WRAPPERDIR}/libgcrypt-config - echo "exec ${XBPS_CROSS_BASE}/usr/bin/libgcrypt-config --prefix=${XBPS_CROSS_BASE}/usr \"\$@\"" >> ${WRAPPERDIR}/libgcrypt-config - chmod 755 ${WRAPPERDIR}/libgcrypt-config + echo "#!/bin/sh" >> ${WRAPPERDIR}/${wrapper} + echo "exec ${XBPS_CROSS_BASE}/usr/bin/${wrapper} --prefix=${XBPS_CROSS_BASE}/usr \"\$@\"" >> ${WRAPPERDIR}/${wrapper} + chmod 755 ${WRAPPERDIR}/${wrapper} } hook() { @@ -27,8 +20,9 @@ hook() { mkdir -p ${WRAPPERDIR} # create wrapers - icu_config_wrapper - libgcrypt_config_wrapper + generic_wrapper icu-config + generic_wrapper libgcrypt-config + generic_wrapper freetype-config export PATH=${WRAPPERDIR}:$PATH }