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 71B6D158020 for ; Tue, 8 Nov 2022 01:30:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E12CE0948; Tue, 8 Nov 2022 01:30:52 +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 3FA62E0948 for ; Tue, 8 Nov 2022 01:30:52 +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 072E3340FC5 for ; Tue, 8 Nov 2022 01:30:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A1026F2 for ; Tue, 8 Nov 2022 01:30:49 +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: <1667870301.9e31f300c271105246eff16f2ec30e61d8754876.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild X-VCS-Directories: sys-libs/libxcrypt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9e31f300c271105246eff16f2ec30e61d8754876 X-VCS-Branch: master Date: Tue, 8 Nov 2022 01:30:49 +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: 4f05831a-8bae-470f-a9e7-437fd25cd8c7 X-Archives-Hash: 376ceb0050b338d0b3f8508f96b163fd commit: 9e31f300c271105246eff16f2ec30e61d8754876 Author: Sam James gentoo org> AuthorDate: Tue Nov 8 01:18:21 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 8 01:18:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e31f300 sys-libs/libxcrypt: add (R)DEPEND on sys-libs/musl too Ordering for a fresh crossdev root w/ 'armv7a-unknown-linux-musleabihf-emerge -v1 musl' now works correctly instead of pulling in libxcrypt first. Signed-off-by: Sam James gentoo.org> sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild index bb75ae09bb7a..d0bd8a723065 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild @@ -37,12 +37,14 @@ is_cross() { [[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]] } -DEPEND="system? ( +DEPEND=" + system? ( elibc_glibc? ( ${CATEGORY}/glibc[-crypt(+)] !${CATEGORY}/glibc[crypt(+)] ) elibc_musl? ( + ${CATEGORY}/musl[-crypt(+)] !${CATEGORY}/musl[crypt(+)] ) )