commit:     ac6191ed2fff5b6070ff1efb7128f70b501176d0
Author:     Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com>
AuthorDate: Fri May  6 08:58:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May  7 05:03:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6191ed

sys-libs/libxcrypt: fix cross + system dependencies

Starting with the v4.4.28 ebuild, libxcrypt supports cross-* builds
so we need to ensure the dependencies are properly specified, for
eg: aarch64-cros-linux-gnu/libxcrypt needs to depend on the
aarch64-cros-linux-gnu/glibc instead of plain sys-libs/glibc.

Closes: https://bugs.gentoo.org/842906
Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com>
Closes: https://github.com/gentoo/gentoo/pull/25348
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
index f4a2b797141a..50aec10c1952 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
@@ -39,10 +39,10 @@ is_cross() {
 
 DEPEND="system? (
                elibc_glibc? (
-                       sys-libs/glibc[-crypt(+)]
-                       !sys-libs/glibc[crypt(+)]
+                       ${CATEGORY}/glibc[-crypt(+)]
+                       !${CATEGORY}/glibc[crypt(+)]
                )
-               !sys-libs/musl
+               !${CATEGORY}/musl
        )
 "
 RDEPEND="${DEPEND}"

Reply via email to