From ed1119d67cdab7a3dae9446b76b9b238528084a9 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 27 May 2025 13:47:58 +0100 Subject: [PATCH] sys-libs/musl: fix sanity check for merged-usr Bug: https://bugs.gentoo.org/956676 Signed-off-by: Sam James --- 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 90e86cef2f07c..dc66ad572b910 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 bd3a60ef270f8..b72b6ab4eafab 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 }