[patch] Fix cross compile for main arch

0001-sys-libs-musl-Fix-cross-compile.patch (text/plain), 1.70 KB, created by Jory A. Pratt on 2020-05-18 02:09:50 UTC

From dee78625013292e1e545641f19c79897f87075a0 Mon Sep 17 00:00:00 2001
From: Jory Pratt <[e-mail]>
Date: Sun, 17 May 2020 21:07:13 -0500
Subject: [PATCH] sys-libs/musl: Fix cross compile

Closes: https://bugs.gentoo.org/645626
Closes: https://bugs.gentoo.org/642612
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jory Pratt <[e-mail]>
---
 sys-libs/musl/musl-1.1.24.ebuild | 2 +-
 sys-libs/musl/musl-1.2.0.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 7948e4dbf5b..e963675fa25 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -98,7 +98,7 @@ src_install() {
 	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 
 	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		local arch=${CHOST%%-*}
 		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
 		cp "${FILESDIR}"/ldconfig.in "${T}" || die
 		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
diff --git a/sys-libs/musl/musl-1.2.0.ebuild b/sys-libs/musl/musl-1.2.0.ebuild
index e33c6c80913..1fcfbb96835 100644
--- a/sys-libs/musl/musl-1.2.0.ebuild
+++ b/sys-libs/musl/musl-1.2.0.ebuild
@@ -98,7 +98,7 @@ src_install() {
 	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
 
 	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		local arch=${CHOST%%-*}
 		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
 		cp "${FILESDIR}"/ldconfig.in "${T}" || die
 		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-- 
2.26.2