sys-libs/musl: fix ldconfig's handling of ROOT

[thesamesam]

No description provided.

[gentoo-bot]

Pull Request assignment

Submitter: @thesamesam
Areas affected: ebuilds
Packages affected: sys-libs/musl

sys-libs/musl: @blueness, @lu-zero, @gentoo/toolchain, @gentoo/hardened musl

Linked bugs

Bugs linked: 666246

---

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

[thesamesam]

--- ldconfig.in	2021-11-18 00:43:19.282394541 +0000
+++ ldconfig.in-r1	2021-11-18 00:48:26.831110160 +0000
@@ -1,16 +1,9 @@
 #!/bin/bash -e
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 ROOT="/"
-
 LDSO_CONF="/etc/ld.so.conf"
-if [[ ! -e $LDSO_CONF ]]; then
-	echo "$LDSO_CONF not found" >&2
-	exit 1
-fi
-
-LDSO_CONF_DIR=$(dirname $LDSO_CONF)

 VERBOSE=0

@@ -25,6 +18,8 @@
 			;;
 		r)
 			ROOT=$OPTARG
+			LDSO_CONF=$ROOT$LDSO_CONF
+			LDSO_CONF_DIR=$(dirname $LDSO_CONF)
 			;;
 		f)
 			LDSO_CONF=$OPTARG
@@ -122,11 +117,19 @@
 }

 get_options "$@"
+
+if [[ ! -e $LDSO_CONF ]]; then
+        echo "$LDSO_CONF not found" >&2
+        exit 1
+fi
+
+LDSO_CONF_DIR=$(dirname $LDSO_CONF)
+
 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 +137,7 @@

 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

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2021-11-18 01:00 UTC
Newest commit scanned: cc92cd1
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/cccdcf8ab0/output.html

[gentoo-repo-qa-bot]

Pull request CI report

Report generated at: 2021-11-18 01:20 UTC
Newest commit scanned: 6d04d43
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/dc122ec270/output.html