diff options
| author |   Sam James <sam@gentoo.org> | 2022-09-12 18:17:14 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-12 18:18:25 +0100 |
| commit | debdd71325ce92399c751cd713f44a4be063ec83 (patch) | |
| tree | c3240e1d029a08af307ca770b16636d8753b20c1 /sys-libs/musl | |
| parent | media-libs/libsdl2: fix configure tests with Clang 15 (diff) | |
| download | gentoo-debdd71325ce92399c751cd713f44a4be063ec83.tar.gz gentoo-debdd71325ce92399c751cd713f44a4be063ec83.tar.bz2 gentoo-debdd71325ce92399c751cd713f44a4be063ec83.zip | |
sys-libs/musl: tweak libxcrypt logic for cross
We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?)
built as part as crossdev. Also, elide the blockers when in cross-*,
as it doesn't make sense to block the normal CBUILD libxcrypt at all
there when we're installing into /usr/${CHOST} anyway.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs/musl')
| -rw-r--r-- | sys-libs/musl/musl-1.2.3-r3.ebuild (renamed from sys-libs/musl/musl-1.2.3-r2.ebuild) | 16 | ||||
| -rw-r--r-- | sys-libs/musl/musl-9999.ebuild | 12 |
2 files changed, 20 insertions, 8 deletions
diff --git a/sys-libs/musl/musl-1.2.3-r2.ebuild b/sys-libs/musl/musl-1.2.3-r3.ebuild index 153da9d0a707..563d555aab5a 100644 --- a/sys-libs/musl/musl-1.2.3-r2.ebuild +++ b/sys-libs/musl/musl-1.2.3-r3.ebuild @@ -43,10 +43,18 @@ IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" -RDEPEND=" - crypt? ( !sys-libs/libxcrypt[system] ) - !crypt? ( sys-libs/libxcrypt[system] ) -" +# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) +# built as part as crossdev. Also, elide the blockers when in cross-*, +# as it doesn't make sense to block the normal CBUILD libxcrypt at all +# there when we're installing into /usr/${CHOST} anyway. +if [[ ${CATEGORY} == cross-* ]] ; then + IUSE="${IUSE/crypt/+crypt}" +else + RDEPEND=" + crypt? ( !sys-libs/libxcrypt[system] ) + !crypt? ( sys-libs/libxcrypt[system] ) + " +fi is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 153da9d0a707..b42381e40998 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -43,10 +43,14 @@ IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" -RDEPEND=" - crypt? ( !sys-libs/libxcrypt[system] ) - !crypt? ( sys-libs/libxcrypt[system] ) -" +if [[ ${CATEGORY} == cross-* ]] ; then + IUSE="${IUSE/crypt/+crypt}" +else + RDEPEND=" + crypt? ( !sys-libs/libxcrypt[system] ) + !crypt? ( sys-libs/libxcrypt[system] ) + " +fi is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] |