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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E137158B20 for ; Tue, 04 Feb 2025 17:13:21 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 21ED4342F94 for ; Tue, 04 Feb 2025 17:13:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id EB78311046F; Tue, 04 Feb 2025 17:13:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E0C5E11046F for ; Tue, 04 Feb 2025 17:13:19 +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 88E39341630 for ; Tue, 04 Feb 2025 17:13:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6CB91CE6 for ; Tue, 04 Feb 2025 17:13:17 +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: <1738689177.3ec2eca027c1f89b06b753595aadcd428e140cc8.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.3-r9.ebuild sys-libs/musl/musl-1.2.4-r1.ebuild sys-libs/musl/musl-1.2.4-r3.ebuild sys-libs/musl/musl-1.2.5-r2.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: 3ec2eca027c1f89b06b753595aadcd428e140cc8 X-VCS-Branch: master Date: Tue, 04 Feb 2025 17:13:17 +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: 3ec37115-3879-439d-a54f-9693a0d75a49 X-Archives-Hash: 4f2911219835cfaa51179ce74fda10ad commit: 3ec2eca027c1f89b06b753595aadcd428e140cc8 Author: Sam James gentoo org> AuthorDate: Tue Feb 4 17:12:15 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 4 17:12:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec2eca0 sys-libs/musl: fix libcrypt removal in more cases See 335b2bb125f1abab97abb55c9ed70cfeeff1eb72. Reported by navi. Signed-off-by: Sam James gentoo.org> sys-libs/musl/musl-1.2.3-r9.ebuild | 2 +- sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +- sys-libs/musl/musl-1.2.4-r3.ebuild | 2 +- sys-libs/musl/musl-1.2.5-r2.ebuild | 2 +- sys-libs/musl/musl-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r9.ebuild b/sys-libs/musl/musl-1.2.3-r9.ebuild index 3436d7f34687..8bf64a63a329 100644 --- a/sys-libs/musl/musl-1.2.3-r9.ebuild +++ b/sys-libs/musl/musl-1.2.3-r9.ebuild @@ -153,7 +153,7 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead rm "${ED}${sysroot}/usr/include/crypt.h" || die - rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die + rm "${ED}${sysroot}"/usr/*/libcrypt.a || die fi if [[ ${CATEGORY} != cross-* ]] ; then diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild index 581ac6ffe152..b2bac312c049 100644 --- a/sys-libs/musl/musl-1.2.4-r1.ebuild +++ b/sys-libs/musl/musl-1.2.4-r1.ebuild @@ -141,7 +141,7 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead rm "${ED}${sysroot}/usr/include/crypt.h" || die - rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die + rm "${ED}${sysroot}"/usr/*/libcrypt.a || die fi if ! is_crosspkg ; then diff --git a/sys-libs/musl/musl-1.2.4-r3.ebuild b/sys-libs/musl/musl-1.2.4-r3.ebuild index 3909d62c13de..075014883959 100644 --- a/sys-libs/musl/musl-1.2.4-r3.ebuild +++ b/sys-libs/musl/musl-1.2.4-r3.ebuild @@ -143,7 +143,7 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead rm "${ED}${sysroot}/usr/include/crypt.h" || die - rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die + rm "${ED}${sysroot}"/usr/*/libcrypt.a || die fi if ! is_crosspkg ; then diff --git a/sys-libs/musl/musl-1.2.5-r2.ebuild b/sys-libs/musl/musl-1.2.5-r2.ebuild index 62c8bedc5e27..b4b879b11542 100644 --- a/sys-libs/musl/musl-1.2.5-r2.ebuild +++ b/sys-libs/musl/musl-1.2.5-r2.ebuild @@ -144,7 +144,7 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead rm "${ED}${sysroot}/usr/include/crypt.h" || die - rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die + rm "${ED}${sysroot}"/usr/*/libcrypt.a || die fi if ! is_crosspkg ; then diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 5679adc85bec..3839dbffc355 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -139,7 +139,7 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead rm "${ED}${sysroot}/usr/include/crypt.h" || die - rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die + rm "${ED}${sysroot}"/usr/*/libcrypt.a || die fi if ! is_crosspkg ; then