diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index c7592245473..17c80e4a568 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -79,15 +79,17 @@ _EOF ln -sf ${XBPS_CROSS_TRIPLET}-pkg-config ${XBPS_WRAPPERDIR}/pkg-config } -install_wrapper() { - install -m0755 ${XBPS_COMMONDIR}/hooks/pre-configure/install-wrapper \ - ${XBPS_WRAPPERDIR}/install +install_wrappers() { + for f in install ldconfig; do + install -m0755 ${XBPS_COMMONDIR}/hooks/pre-configure/${f}-wrapper \ + ${XBPS_WRAPPERDIR}/${f} + done } hook() { export PATH="$XBPS_WRAPPERDIR:$PATH" - install_wrapper + install_wrappers [ -z "$CROSS_BUILD" ] && return 0 diff --git a/common/hooks/pre-configure/install-wrapper b/common/hooks/pre-configure/install-wrapper old mode 100755 new mode 100644 diff --git a/common/hooks/pre-configure/ldconfig-wrapper b/common/hooks/pre-configure/ldconfig-wrapper new file mode 100644 index 00000000000..f8392bd0178 --- /dev/null +++ b/common/hooks/pre-configure/ldconfig-wrapper @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "ldconfig-wrapper: ignoring arguments: $@" +exit 0