summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-09-19 16:50:33 +0100
committerSam James <sam@gentoo.org>2022-09-19 16:50:33 +0100
commit0f515d501eea31a42364499f4537a70efbf1d924 (patch)
treea7d2ed0f31ee1783a5ae5fae4415f1532f958493
parentwww-apps/nextcloud: add 23.0.9, 24.0.5 (diff)
downloadgentoo-0f515d501eea31a42364499f4537a70efbf1d924.tar.gz
gentoo-0f515d501eea31a42364499f4537a70efbf1d924.tar.bz2
gentoo-0f515d501eea31a42364499f4537a70efbf1d924.zip
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@gentoo.org>
-rw-r--r--sys-libs/musl/musl-1.2.3-r4.ebuild (renamed from sys-libs/musl/musl-1.2.3-r3.ebuild)3
-rw-r--r--sys-libs/musl/musl-9999.ebuild3
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
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