From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EE5E158094 for ; Mon, 19 Sep 2022 15:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45588E07E1; Mon, 19 Sep 2022 15:51:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 pigeon.gentoo.org (Postfix) with ESMTPS id 2B8D5E07E1 for ; Mon, 19 Sep 2022 15:51:01 +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 0F61C340C24 for ; Mon, 19 Sep 2022 15:51:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65CE25D5 for ; Mon, 19 Sep 2022 15:50:58 +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: <1663602633.0f515d501eea31a42364499f4537a70efbf1d924.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-r3.ebuild sys-libs/musl/musl-1.2.3-r4.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: 0f515d501eea31a42364499f4537a70efbf1d924 X-VCS-Branch: master Date: Mon, 19 Sep 2022 15:50:58 +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: ee3d6cc9-ee02-4bfc-b35a-bae122c0585f X-Archives-Hash: cccd97e19b5e555de8cf556b02f3dde9 commit: 0f515d501eea31a42364499f4537a70efbf1d924 Author: Sam James gentoo org> AuthorDate: Mon Sep 19 15:50:33 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Sep 19 15:50:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f515d50 sys-libs/musl: drop libcrypt.a too for USE=-crypt While musl doesn't split out libcrypt.so, it does apparently for libcrypt.a. Closes: https://bugs.gentoo.org/871726 Signed-off-by: Sam James gentoo.org> sys-libs/musl/{musl-1.2.3-r3.ebuild => musl-1.2.3-r4.ebuild} | 3 ++- sys-libs/musl/musl-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r3.ebuild b/sys-libs/musl/musl-1.2.3-r4.ebuild similarity index 98% rename from sys-libs/musl/musl-1.2.3-r3.ebuild rename to sys-libs/musl/musl-1.2.3-r4.ebuild index 215d34d742fa..1d60464d46a4 100644 --- a/sys-libs/musl/musl-1.2.3-r3.ebuild +++ b/sys-libs/musl/musl-1.2.3-r4.ebuild @@ -149,7 +149,8 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead - rm "${ED}"/usr/include/crypt.h || die + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die fi if [[ ${CATEGORY} != cross-* ]] ; then diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 215d34d742fa..1d60464d46a4 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -149,7 +149,8 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead - rm "${ED}"/usr/include/crypt.h || die + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die fi if [[ ${CATEGORY} != cross-* ]] ; then