From 62a643d5c771eb5f645e80151428cade0c55486f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Apr 2015 10:29:58 +0200 Subject: [PATCH] xbps-src: create a dummy ldconfig wrapper. This fixes build/installation of some pkgs that exec ldconfig gratuitously (ntfs-3g fails with musl due to this). --- common/hooks/pre-configure/02-script-wrapper.sh | 10 ++++++---- common/hooks/pre-configure/install-wrapper | 0 common/hooks/pre-configure/ldconfig-wrapper | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) mode change 100755 => 100644 common/hooks/pre-configure/install-wrapper create mode 100644 common/hooks/pre-configure/ldconfig-wrapper 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