| 1 |
commit: debdd71325ce92399c751cd713f44a4be063ec83 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 12 17:17:14 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 12 17:18:25 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debdd713 |
| 7 |
|
| 8 |
sys-libs/musl: tweak libxcrypt logic for cross |
| 9 |
|
| 10 |
We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) |
| 11 |
built as part as crossdev. Also, elide the blockers when in cross-*, |
| 12 |
as it doesn't make sense to block the normal CBUILD libxcrypt at all |
| 13 |
there when we're installing into /usr/${CHOST} anyway. |
| 14 |
|
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
.../musl/{musl-1.2.3-r2.ebuild => musl-1.2.3-r3.ebuild} | 16 ++++++++++++---- |
| 18 |
sys-libs/musl/musl-9999.ebuild | 12 ++++++++---- |
| 19 |
2 files changed, 20 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-libs/musl/musl-1.2.3-r2.ebuild b/sys-libs/musl/musl-1.2.3-r3.ebuild |
| 22 |
similarity index 91% |
| 23 |
rename from sys-libs/musl/musl-1.2.3-r2.ebuild |
| 24 |
rename to sys-libs/musl/musl-1.2.3-r3.ebuild |
| 25 |
index 153da9d0a707..563d555aab5a 100644 |
| 26 |
--- a/sys-libs/musl/musl-1.2.3-r2.ebuild |
| 27 |
+++ b/sys-libs/musl/musl-1.2.3-r3.ebuild |
| 28 |
@@ -43,10 +43,18 @@ IUSE="crypt headers-only" |
| 29 |
QA_SONAME="/usr/lib/libc.so" |
| 30 |
QA_DT_NEEDED="/usr/lib/libc.so" |
| 31 |
|
| 32 |
-RDEPEND=" |
| 33 |
- crypt? ( !sys-libs/libxcrypt[system] ) |
| 34 |
- !crypt? ( sys-libs/libxcrypt[system] ) |
| 35 |
-" |
| 36 |
+# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) |
| 37 |
+# built as part as crossdev. Also, elide the blockers when in cross-*, |
| 38 |
+# as it doesn't make sense to block the normal CBUILD libxcrypt at all |
| 39 |
+# there when we're installing into /usr/${CHOST} anyway. |
| 40 |
+if [[ ${CATEGORY} == cross-* ]] ; then |
| 41 |
+ IUSE="${IUSE/crypt/+crypt}" |
| 42 |
+else |
| 43 |
+ RDEPEND=" |
| 44 |
+ crypt? ( !sys-libs/libxcrypt[system] ) |
| 45 |
+ !crypt? ( sys-libs/libxcrypt[system] ) |
| 46 |
+ " |
| 47 |
+fi |
| 48 |
|
| 49 |
is_crosscompile() { |
| 50 |
[[ ${CHOST} != ${CTARGET} ]] |
| 51 |
|
| 52 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
| 53 |
index 153da9d0a707..b42381e40998 100644 |
| 54 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 55 |
+++ b/sys-libs/musl/musl-9999.ebuild |
| 56 |
@@ -43,10 +43,14 @@ IUSE="crypt headers-only" |
| 57 |
QA_SONAME="/usr/lib/libc.so" |
| 58 |
QA_DT_NEEDED="/usr/lib/libc.so" |
| 59 |
|
| 60 |
-RDEPEND=" |
| 61 |
- crypt? ( !sys-libs/libxcrypt[system] ) |
| 62 |
- !crypt? ( sys-libs/libxcrypt[system] ) |
| 63 |
-" |
| 64 |
+if [[ ${CATEGORY} == cross-* ]] ; then |
| 65 |
+ IUSE="${IUSE/crypt/+crypt}" |
| 66 |
+else |
| 67 |
+ RDEPEND=" |
| 68 |
+ crypt? ( !sys-libs/libxcrypt[system] ) |
| 69 |
+ !crypt? ( sys-libs/libxcrypt[system] ) |
| 70 |
+ " |
| 71 |
+fi |
| 72 |
|
| 73 |
is_crosscompile() { |
| 74 |
[[ ${CHOST} != ${CTARGET} ]] |
Archives