commit: 6be6a952bef5e640dd3a49fb447e5858e967ec8f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 07:18:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 07:19:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be6a952
sys-libs/musl: use ${ED} not ${D} in sysroot hack
Need to ensure the rest of the ebuild is Prefix ready anyway
but there's no reason to make it worse with stuff we
recently added, so let's use ${ED} there.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/musl/musl-1.2.2-r4.ebuild | 4 ++--
sys-libs/musl/musl-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-libs/musl/musl-1.2.2-r4.ebuild
b/sys-libs/musl/musl-1.2.2-r4.ebuild
index 0fe2c8c9a67b..bb9c60c348d0 100644
--- a/sys-libs/musl/musl-1.2.2-r4.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r4.ebuild
@@ -128,7 +128,7 @@ src_install() {
# and print $(ARCH)$(SUBARCH).
local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s",
k["ARCH"], k["SUBARCH"]); }' config.mak)
- if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then
+ if [[ ! -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] ; then
# During cross (using crossdev), when emerging
sys-libs/musl,
# if /usr/lib/libc.so.1 doesn't exist on the system,
installation
# would fail.
@@ -141,7 +141,7 @@ src_install() {
dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
# If it's still a dead symlnk, OK, we really do need to
abort.
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
fi
cp "${FILESDIR}"/ldconfig.in "${T}" || die
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 5736eadc0fb4..6406ba1a6633 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -121,7 +121,7 @@ src_install() {
# and print $(ARCH)$(SUBARCH).
local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s",
k["ARCH"], k["SUBARCH"]); }' config.mak)
- if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then
+ if [[ ! -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] ; then
# During cross (using crossdev), when emerging
sys-libs/musl,
# if /usr/lib/libc.so.1 doesn't exist on the system,
installation
# would fail.
@@ -134,7 +134,7 @@ src_install() {
dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1
# If it's still a dead symlnk, OK, we really do need to
abort.
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+ [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die
fi
cp "${FILESDIR}"/ldconfig.in "${T}" || die
