| 1 |
commit: ac6191ed2fff5b6070ff1efb7128f70b501176d0 |
| 2 |
Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> |
| 3 |
AuthorDate: Fri May 6 08:58:01 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 7 05:03:44 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6191ed |
| 7 |
|
| 8 |
sys-libs/libxcrypt: fix cross + system dependencies |
| 9 |
|
| 10 |
Starting with the v4.4.28 ebuild, libxcrypt supports cross-* builds |
| 11 |
so we need to ensure the dependencies are properly specified, for |
| 12 |
eg: aarch64-cros-linux-gnu/libxcrypt needs to depend on the |
| 13 |
aarch64-cros-linux-gnu/glibc instead of plain sys-libs/glibc. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/842906 |
| 16 |
Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/25348 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild | 6 +++--- |
| 21 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild |
| 24 |
index f4a2b797141a..50aec10c1952 100644 |
| 25 |
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild |
| 26 |
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild |
| 27 |
@@ -39,10 +39,10 @@ is_cross() { |
| 28 |
|
| 29 |
DEPEND="system? ( |
| 30 |
elibc_glibc? ( |
| 31 |
- sys-libs/glibc[-crypt(+)] |
| 32 |
- !sys-libs/glibc[crypt(+)] |
| 33 |
+ ${CATEGORY}/glibc[-crypt(+)] |
| 34 |
+ !${CATEGORY}/glibc[crypt(+)] |
| 35 |
) |
| 36 |
- !sys-libs/musl |
| 37 |
+ !${CATEGORY}/musl |
| 38 |
) |
| 39 |
" |
| 40 |
RDEPEND="${DEPEND}" |
Archives