From 335b2bb125f1abab97abb55c9ed70cfeeff1eb72 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 31 Dec 2024 15:39:04 +0000
Subject: [PATCH] sys-libs/musl: fix -crypt build for cross

See https://forums.gentoo.org/viewtopic-p-8850196.html. We need to
account for ${sysroot} for cross builds.

Signed-off-by: Sam James <sam@gentoo.org>
---
 sys-libs/musl/musl-1.2.4-r1.ebuild | 4 ++--
 sys-libs/musl/musl-1.2.4-r2.ebuild | 4 ++--
 sys-libs/musl/musl-1.2.5-r1.ebuild | 4 ++--
 sys-libs/musl/musl-9999.ebuild     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild
index cffea8ad349b8..2d9af6f92d442 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -140,8 +140,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/$(get_libdir)/libcrypt.a" || die
+		rm "${ED}${sysroot}/usr/include/crypt.h" || die
+		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
 	fi
 
 	if ! is_crosspkg ; then
diff --git a/sys-libs/musl/musl-1.2.4-r2.ebuild b/sys-libs/musl/musl-1.2.4-r2.ebuild
index dbe5caa086bdd..296f83982c96c 100644
--- a/sys-libs/musl/musl-1.2.4-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r2.ebuild
@@ -141,8 +141,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/$(get_libdir)/libcrypt.a" || die
+		rm "${ED}${sysroot}/usr/include/crypt.h" || die
+		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
 	fi
 
 	if ! is_crosspkg ; then
diff --git a/sys-libs/musl/musl-1.2.5-r1.ebuild b/sys-libs/musl/musl-1.2.5-r1.ebuild
index 1e66fed0c7bf1..cd7a1e7cd590c 100644
--- a/sys-libs/musl/musl-1.2.5-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.5-r1.ebuild
@@ -142,8 +142,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/$(get_libdir)/libcrypt.a" || die
+		rm "${ED}${sysroot}/usr/include/crypt.h" || die
+		rm "${ED}${sysroot}/usr/$(get_libdir)/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 1b451cd191ded..278e5e367d771 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -138,8 +138,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/$(get_libdir)/libcrypt.a" || die
+		rm "${ED}${sysroot}/usr/include/crypt.h" || die
+		rm "${ED}${sysroot}/usr/$(get_libdir)/libcrypt.a" || die
 	fi
 
 	if ! is_crosspkg ; then