commit: 0f515d501eea31a42364499f4537a70efbf1d924 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Sep 19 15:50:33 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 19 15:50:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f515d50
sys-libs/musl: drop libcrypt.a too for USE=-crypt While musl doesn't split out libcrypt.so, it does apparently for libcrypt.a. Closes: https://bugs.gentoo.org/871726 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/musl/{musl-1.2.3-r3.ebuild => musl-1.2.3-r4.ebuild} | 3 ++- sys-libs/musl/musl-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r3.ebuild b/sys-libs/musl/musl-1.2.3-r4.ebuild similarity index 98% rename from sys-libs/musl/musl-1.2.3-r3.ebuild rename to sys-libs/musl/musl-1.2.3-r4.ebuild index 215d34d742fa..1d60464d46a4 100644 --- a/sys-libs/musl/musl-1.2.3-r3.ebuild +++ b/sys-libs/musl/musl-1.2.3-r4.ebuild @@ -149,7 +149,8 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead - rm "${ED}"/usr/include/crypt.h || die + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die fi if [[ ${CATEGORY} != cross-* ]] ; then diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 215d34d742fa..1d60464d46a4 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -149,7 +149,8 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead - rm "${ED}"/usr/include/crypt.h || die + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die fi if [[ ${CATEGORY} != cross-* ]] ; then
