From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0BD901580EB for ; Tue, 27 May 2025 12:49:48 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E85B7343143 for ; Tue, 27 May 2025 12:49:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1FB6511047D; Tue, 27 May 2025 12:49:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 16B1F11047D for ; Tue, 27 May 2025 12:49:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC4C9343116 for ; Tue, 27 May 2025 12:49:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AB3123CC for ; Tue, 27 May 2025 12:49:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1748350137.ed1119d67cdab7a3dae9446b76b9b238528084a9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/musl-1.2.5-r3.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ed1119d67cdab7a3dae9446b76b9b238528084a9 X-VCS-Branch: master Date: Tue, 27 May 2025 12:49:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 819b6a5b-477c-44b2-8928-ff58019f063f X-Archives-Hash: fd055192ab2347b3e7cf2ec611c18e62 commit: ed1119d67cdab7a3dae9446b76b9b238528084a9 Author: Sam James gentoo org> AuthorDate: Tue May 27 12:47:58 2025 +0000 Commit: Sam James gentoo 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 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 }