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 03C83158094 for ; Sun, 11 Sep 2022 17:27:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27DA7E0871; Sun, 11 Sep 2022 17:27:40 +0000 (UTC) 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 pigeon.gentoo.org (Postfix) with ESMTPS id 08664E0871 for ; Sun, 11 Sep 2022 17:27:39 +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 C28D3340BD3 for ; Sun, 11 Sep 2022 17:27:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 166D775 for ; Sun, 11 Sep 2022 17:27:37 +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: <1662917248.dff39d4671198d0287ae9da0263b543affe57d46.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-r1.ebuild sys-libs/musl/musl-1.2.3-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: dff39d4671198d0287ae9da0263b543affe57d46 X-VCS-Branch: master Date: Sun, 11 Sep 2022 17:27:37 +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: 76cd9c8f-a55d-4d11-8b1c-28d74c25d53c X-Archives-Hash: 7ceb4b14b319a046bc41ae8202402597 commit: dff39d4671198d0287ae9da0263b543affe57d46 Author: Sam James gentoo org> AuthorDate: Sun Sep 11 17:27:28 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 11 17:27:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff39d46 sys-libs/musl: fix libxcrypt dep We only need libxcrypt when we DON'T install crypt.h Bug: https://bugs.gentoo.org/867991 Signed-off-by: Sam James gentoo.org> sys-libs/musl/{musl-1.2.3-r1.ebuild => musl-1.2.3-r2.ebuild} | 5 ++++- sys-libs/musl/musl-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r1.ebuild b/sys-libs/musl/musl-1.2.3-r2.ebuild similarity index 98% rename from sys-libs/musl/musl-1.2.3-r1.ebuild rename to sys-libs/musl/musl-1.2.3-r2.ebuild index fedb9137f4cb..153da9d0a707 100644 --- a/sys-libs/musl/musl-1.2.3-r1.ebuild +++ b/sys-libs/musl/musl-1.2.3-r2.ebuild @@ -43,7 +43,10 @@ IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" -RDEPEND="crypt? ( sys-libs/libxcrypt[system] )" +RDEPEND=" + crypt? ( !sys-libs/libxcrypt[system] ) + !crypt? ( sys-libs/libxcrypt[system] ) +" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index fedb9137f4cb..153da9d0a707 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -43,7 +43,10 @@ IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" -RDEPEND="crypt? ( sys-libs/libxcrypt[system] )" +RDEPEND=" + crypt? ( !sys-libs/libxcrypt[system] ) + !crypt? ( sys-libs/libxcrypt[system] ) +" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]]