[patch] fix cross compilation for all supported targets

musl-cross-fixup.patch (text/plain), 2.64 KB, created by Jory A. Pratt on 2020-05-18 20:37:00 UTC

From 71293955286365fed34b8a1dfffdc672054770df Mon Sep 17 00:00:00 2001
From: Jory Pratt <[e-mail]>
Date: Mon, 18 May 2020 15:23:37 -0500
Subject: [PATCH] sys-libs/musl: Fix cross compilation for use with portage

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 | 6 +++++-
 sys-libs/musl/musl-1.2.0.ebuild  | 6 +++++-
 sys-libs/musl/musl-9999.ebuild   | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild
index 7948e4dbf5b..e0efba5a24f 100644
--- a/sys-libs/musl/musl-1.1.24.ebuild
+++ b/sys-libs/musl/musl-1.1.24.ebuild
@@ -98,7 +98,11 @@ 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')
+		case ${CTARGET} in
+			arm*-*-linux-musleabihf)  arch="armhf" ;;
+			i686-*-linux-musl)   arch="i386" ;;
+			*) arch= ${CHOST%%-*} ;;
+		esac
 		[[ -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..789df007afe 100644
--- a/sys-libs/musl/musl-1.2.0.ebuild
+++ b/sys-libs/musl/musl-1.2.0.ebuild
@@ -98,7 +98,11 @@ 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')
+		case ${CTARGET} in
+			arm*-*-linux-musleabihf)  arch="armhf" ;;
+			i686-*-linux-musl)   arch="i386" ;;
+			*) arch= ${CHOST%%-*} ;;
+		esac
 		[[ -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-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 50beaf64e1a..a4130f068a9 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -98,7 +98,11 @@ 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')
+		case ${CTARGET} in
+			arm*-*-linux-musleabihf)  arch="armhf" ;;
+			i686-*-linux-musl)   arch="i386" ;;
+			*) arch= ${CHOST%%-*} ;;
+		esac
 		[[ -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