From bba17dc756bc98f9346574b0ed2a024cf1ba5657 Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Mon, 18 May 2020 17:32:35 -0500 Subject: [PATCH] sys-libs/musl: Fix cross compilation for use with portage 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 --- 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..405bc0b1203 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..b2a6a358f50 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..cd466668246 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