Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 645626 | Differences between
and this patch

Collapse All | Expand All

(-)a/sys-libs/musl/musl-1.1.24.ebuild (-1 / +5 lines)
Lines 98-104 src_install() { Link Here
98
	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
98
	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
99
99
100
	if [[ ${CATEGORY} != cross-* ]] ; then
100
	if [[ ${CATEGORY} != cross-* ]] ; then
101
		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
101
		case ${CTARGET} in
102
			arm*-*-linux-musleabihf)  arch="armhf" ;;
103
			i686-*-linux-musl)   arch="i386" ;;
104
			*) arch= ${CHOST%%-*} ;;
105
		esac
102
		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
106
		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
103
		cp "${FILESDIR}"/ldconfig.in "${T}" || die
107
		cp "${FILESDIR}"/ldconfig.in "${T}" || die
104
		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
108
		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
(-)a/sys-libs/musl/musl-1.2.0.ebuild (-1 / +5 lines)
Lines 98-104 src_install() { Link Here
98
	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
98
	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
99
99
100
	if [[ ${CATEGORY} != cross-* ]] ; then
100
	if [[ ${CATEGORY} != cross-* ]] ; then
101
		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
101
		case ${CTARGET} in
102
			arm*-*-linux-musleabihf)  arch="armhf" ;;
103
			i686-*-linux-musl)   arch="i386" ;;
104
			*) arch= ${CHOST%%-*} ;;
105
		esac
102
		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
106
		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
103
		cp "${FILESDIR}"/ldconfig.in "${T}" || die
107
		cp "${FILESDIR}"/ldconfig.in "${T}" || die
104
		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
108
		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
(-)a/sys-libs/musl/musl-9999.ebuild (-2 / +5 lines)
Lines 98-104 src_install() { Link Here
98
	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
98
	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
99
99
100
	if [[ ${CATEGORY} != cross-* ]] ; then
100
	if [[ ${CATEGORY} != cross-* ]] ; then
101
		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
101
		case ${CTARGET} in
102
			arm*-*-linux-musleabihf)  arch="armhf" ;;
103
			i686-*-linux-musl)   arch="i386" ;;
104
			*) arch= ${CHOST%%-*} ;;
105
		esac
102
		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
106
		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
103
		cp "${FILESDIR}"/ldconfig.in "${T}" || die
107
		cp "${FILESDIR}"/ldconfig.in "${T}" || die
104
		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
108
		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
105
- 

Return to bug 645626