From 659fd732738dc0256650cabe391a4385cdf7a8d5 Mon Sep 17 00:00:00 2001 From: Wiktor Kerr Date: Fri, 14 Sep 2018 20:37:53 +0000 Subject: [PATCH] sys-libs/musl: make ldconfig script respect -r --- sys-libs/musl/files/ldconfig.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-libs/musl/files/ldconfig.in b/sys-libs/musl/files/ldconfig.in index 19c94d8535..362d11ce81 100644 --- a/sys-libs/musl/files/ldconfig.in +++ b/sys-libs/musl/files/ldconfig.in @@ -25,6 +25,8 @@ get_options() { ;; r) ROOT=$OPTARG + LDSO_CONF=$ROOT$LDSO_CONF + LDSO_CONF_DIR=$(dirname $LDSO_CONF) ;; f) LDSO_CONF=$OPTARG @@ -126,7 +128,7 @@ drs=$(read_ldso_conf "$LDSO_CONF") drs=$(sanitize $drs) ARCH=@@ARCH@@ -LDSO_PATH="/lib/ld-musl-${ARCH}.so.1" +LDSO_PATH="$ROOT/lib/ld-musl-${ARCH}.so.1" if [[ ! -e $LDSO_PATH ]]; then echo "$LDSO_PATH not found" >&2 exit 1 @@ -134,7 +136,7 @@ fi LDSO_ARCH=$(basename $LDSO_PATH) LDSO_NAME=${LDSO_ARCH%.so.1} -ETC_LDSO_PATH=/etc/${LDSO_NAME}.path +ETC_LDSO_PATH="$ROOT/etc/${LDSO_NAME}.path" X=$(mktemp -p /tmp ${LDSO_NAME}.XXXXXX) for d in $drs; do -- 2.16.4