[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/

[Sam James]

commit:     3ec2eca027c1f89b06b753595aadcd428e140cc8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 17:12:15 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 17:12:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec2eca0

sys-libs/musl: fix libcrypt removal in more cases

See 335b2bb125f1abab97abb55c9ed70cfeeff1eb72. Reported by navi.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/musl/musl-1.2.3-r9.ebuild | 2 +-
 sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
 sys-libs/musl/musl-1.2.4-r3.ebuild | 2 +-
 sys-libs/musl/musl-1.2.5-r2.ebuild | 2 +-
 sys-libs/musl/musl-9999.ebuild     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-libs/musl/musl-1.2.3-r9.ebuild 
b/sys-libs/musl/musl-1.2.3-r9.ebuild
index 3436d7f34687..8bf64a63a329 100644
--- a/sys-libs/musl/musl-1.2.3-r9.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r9.ebuild
@@ -153,7 +153,7 @@ src_install() {
        if ! use crypt ; then
                # Allow sys-libs/libxcrypt[system] to provide it instead
                rm "${ED}${sysroot}/usr/include/crypt.h" || die
-               rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+               rm "${ED}${sysroot}"/usr/*/libcrypt.a || die
        fi
 
        if [[ ${CATEGORY} != cross-* ]] ; then

diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild 
b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 581ac6ffe152..b2bac312c049 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -141,7 +141,7 @@ src_install() {
        if ! use crypt ; then
                # Allow sys-libs/libxcrypt[system] to provide it instead
                rm "${ED}${sysroot}/usr/include/crypt.h" || die
-               rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+               rm "${ED}${sysroot}"/usr/*/libcrypt.a || die
        fi
 
        if ! is_crosspkg ; then

diff --git a/sys-libs/musl/musl-1.2.4-r3.ebuild 
b/sys-libs/musl/musl-1.2.4-r3.ebuild
index 3909d62c13de..075014883959 100644
--- a/sys-libs/musl/musl-1.2.4-r3.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r3.ebuild
@@ -143,7 +143,7 @@ src_install() {
        if ! use crypt ; then
                # Allow sys-libs/libxcrypt[system] to provide it instead
                rm "${ED}${sysroot}/usr/include/crypt.h" || die
-               rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+               rm "${ED}${sysroot}"/usr/*/libcrypt.a || die
        fi
 
        if ! is_crosspkg ; then

diff --git a/sys-libs/musl/musl-1.2.5-r2.ebuild 
b/sys-libs/musl/musl-1.2.5-r2.ebuild
index 62c8bedc5e27..b4b879b11542 100644
--- a/sys-libs/musl/musl-1.2.5-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.5-r2.ebuild
@@ -144,7 +144,7 @@ src_install() {
        if ! use crypt ; then
                # Allow sys-libs/libxcrypt[system] to provide it instead
                rm "${ED}${sysroot}/usr/include/crypt.h" || die
-               rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+               rm "${ED}${sysroot}"/usr/*/libcrypt.a || die
        fi
 
        if ! is_crosspkg ; then

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 5679adc85bec..3839dbffc355 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -139,7 +139,7 @@ src_install() {
        if ! use crypt ; then
                # Allow sys-libs/libxcrypt[system] to provide it instead
                rm "${ED}${sysroot}/usr/include/crypt.h" || die
-               rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
+               rm "${ED}${sysroot}"/usr/*/libcrypt.a || die
        fi
 
        if ! is_crosspkg ; then