commit: dff39d4671198d0287ae9da0263b543affe57d46 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 11 17:27:28 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 11 17:27:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff39d46
sys-libs/musl: fix libxcrypt dep We only need libxcrypt when we DON'T install crypt.h Bug: https://bugs.gentoo.org/867991 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/musl/{musl-1.2.3-r1.ebuild => musl-1.2.3-r2.ebuild} | 5 ++++- sys-libs/musl/musl-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r1.ebuild b/sys-libs/musl/musl-1.2.3-r2.ebuild similarity index 98% rename from sys-libs/musl/musl-1.2.3-r1.ebuild rename to sys-libs/musl/musl-1.2.3-r2.ebuild index fedb9137f4cb..153da9d0a707 100644 --- a/sys-libs/musl/musl-1.2.3-r1.ebuild +++ b/sys-libs/musl/musl-1.2.3-r2.ebuild @@ -43,7 +43,10 @@ IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" -RDEPEND="crypt? ( sys-libs/libxcrypt[system] )" +RDEPEND=" + crypt? ( !sys-libs/libxcrypt[system] ) + !crypt? ( sys-libs/libxcrypt[system] ) +" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index fedb9137f4cb..153da9d0a707 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -43,7 +43,10 @@ IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" -RDEPEND="crypt? ( sys-libs/libxcrypt[system] )" +RDEPEND=" + crypt? ( !sys-libs/libxcrypt[system] ) + !crypt? ( sys-libs/libxcrypt[system] ) +" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]]
