commit: ed1119d67cdab7a3dae9446b76b9b238528084a9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue May 27 12:47:58 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 27 12:48:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1119d6
sys-libs/musl: fix sanity check for merged-usr Bug: https://bugs.gentoo.org/956676 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/musl/musl-1.2.5-r3.ebuild | 2 +- sys-libs/musl/musl-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/musl/musl-1.2.5-r3.ebuild b/sys-libs/musl/musl-1.2.5-r3.ebuild index 90e86cef2f07..dc66ad572b91 100644 --- a/sys-libs/musl/musl-1.2.5-r3.ebuild +++ b/sys-libs/musl/musl-1.2.5-r3.ebuild @@ -244,7 +244,7 @@ pkg_preinst() { mkdir -p "${EROOT}"/etc/ld.so.conf.d [[ -n ${ROOT} ]] && return 0 - [[ -d ${ED}/$(get_libdir) ]] || return 0 + [[ -d ${ED}/usr/$(get_libdir) ]] || return 0 musl_sanity_check } diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index bd3a60ef270f..b72b6ab4eafa 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -238,7 +238,7 @@ pkg_preinst() { mkdir -p "${EROOT}"/etc/ld.so.conf.d [[ -n ${ROOT} ]] && return 0 - [[ -d ${ED}/$(get_libdir) ]] || return 0 + [[ -d ${ED}/usr/$(get_libdir) ]] || return 0 musl_sanity_check }
