Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/
Date: Tue, 08 Nov 2022 01:30:53
Message-Id: 1667870301.9e31f300c271105246eff16f2ec30e61d8754876.sam@gentoo
1 commit: 9e31f300c271105246eff16f2ec30e61d8754876
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 8 01:18:21 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 8 01:18:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e31f300
7
8 sys-libs/libxcrypt: add (R)DEPEND on sys-libs/musl too
9
10 Ordering for a fresh crossdev root w/ 'armv7a-unknown-linux-musleabihf-emerge -v1 musl'
11 now works correctly instead of pulling in libxcrypt first.
12
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-)
17
18 diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
19 index bb75ae09bb7a..d0bd8a723065 100644
20 --- a/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
21 +++ b/sys-libs/libxcrypt/libxcrypt-4.4.30.ebuild
22 @@ -37,12 +37,14 @@ is_cross() {
23 [[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
24 }
25
26 -DEPEND="system? (
27 +DEPEND="
28 + system? (
29 elibc_glibc? (
30 ${CATEGORY}/glibc[-crypt(+)]
31 !${CATEGORY}/glibc[crypt(+)]
32 )
33 elibc_musl? (
34 + ${CATEGORY}/musl[-crypt(+)]
35 !${CATEGORY}/musl[crypt(+)]
36 )
37 )