From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E9D0138330 for ; Sat, 24 Sep 2016 13:51:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3896BE08F8; Sat, 24 Sep 2016 13:51:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDACEE08F8 for ; Sat, 24 Sep 2016 13:51:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8EB8340A03 for ; Sat, 24 Sep 2016 13:51:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 345AD248D for ; Sat, 24 Sep 2016 13:51:12 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1474725068.b37736d745e1ea1bf0e0bc10917dc6f84b21dbe0.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/musl-1.1.15-r1.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b37736d745e1ea1bf0e0bc10917dc6f84b21dbe0 X-VCS-Branch: master Date: Sat, 24 Sep 2016 13:51:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8a7dab59-2b6f-418c-b3b5-6419fa2ddd18 X-Archives-Hash: 7f1f915af9108eb2b719de518516c515 commit: b37736d745e1ea1bf0e0bc10917dc6f84b21dbe0 Author: Felix Janda posteo de> AuthorDate: Sat Sep 24 02:41:34 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 24 13:51:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37736d7 sys-libs/musl: revbump to improve the ldconfig script Also add some more "|| die". Gentoo-Bug: https://bugs.gentoo.org/592268 Signed-off-by: Anthony G. Basile gentoo.org> .../{musl-9999.ebuild => musl-1.1.15-r1.ebuild} | 33 ++++------------------ sys-libs/musl/musl-9999.ebuild | 33 ++++------------------ 2 files changed, 12 insertions(+), 54 deletions(-) diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.1.15-r1.ebuild similarity index 74% copy from sys-libs/musl/musl-9999.ebuild copy to sys-libs/musl/musl-1.1.15-r1.ebuild index 906de18..ae82136 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-1.1.15-r1.ebuild @@ -46,17 +46,6 @@ just_headers() { use crosscompile_opts_headers-only && is_crosscompile } -musl_endian() { - # XXX: this wont work for bi-endian, but we dont have any - touch "${T}"/endian.s || die - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "";; - *" LSB "*) echo "el";; - *) echo "nfc";; # We shouldn't be here - esac -} - pkg_setup() { if [ ${CTARGET} == ${CHOST} ] ; then case ${CHOST} in @@ -76,7 +65,7 @@ src_configure() { --target=${CTARGET} \ --prefix=${sysroot}/usr \ --syslibdir=${sysroot}/lib \ - --disable-gcc-wrapper + --disable-gcc-wrapper || die } src_compile() { @@ -84,9 +73,9 @@ src_compile() { just_headers && return 0 emake - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die } src_install() { @@ -102,17 +91,7 @@ src_install() { dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd if [[ ${CATEGORY} != cross-* ]] ; then - # TODO: We may be able to simplify this code by obtianing the arch name with - # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p' - local target=$(tc-arch) arch - local endian=$(musl_endian) - case ${target} in - amd64) arch="x86_64";; - arm) arch="armhf";; # We only have hardfloat right now - mips) arch="mips${endian}";; - ppc) arch="powerpc";; - x86) arch="i386";; - esac + local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') cp "${FILESDIR}"/ldconfig.in "${T}" || die sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die into / @@ -131,7 +110,7 @@ pkg_postinst() { [ "${ROOT}" != "/" ] && return 0 - ldconfig + ldconfig || die # reload init ... /sbin/telinit U 2>/dev/null } diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 906de18..ae82136 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -46,17 +46,6 @@ just_headers() { use crosscompile_opts_headers-only && is_crosscompile } -musl_endian() { - # XXX: this wont work for bi-endian, but we dont have any - touch "${T}"/endian.s || die - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "";; - *" LSB "*) echo "el";; - *) echo "nfc";; # We shouldn't be here - esac -} - pkg_setup() { if [ ${CTARGET} == ${CHOST} ] ; then case ${CHOST} in @@ -76,7 +65,7 @@ src_configure() { --target=${CTARGET} \ --prefix=${sysroot}/usr \ --syslibdir=${sysroot}/lib \ - --disable-gcc-wrapper + --disable-gcc-wrapper || die } src_compile() { @@ -84,9 +73,9 @@ src_compile() { just_headers && return 0 emake - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die } src_install() { @@ -102,17 +91,7 @@ src_install() { dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd if [[ ${CATEGORY} != cross-* ]] ; then - # TODO: We may be able to simplify this code by obtianing the arch name with - # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p' - local target=$(tc-arch) arch - local endian=$(musl_endian) - case ${target} in - amd64) arch="x86_64";; - arm) arch="armhf";; # We only have hardfloat right now - mips) arch="mips${endian}";; - ppc) arch="powerpc";; - x86) arch="i386";; - esac + local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') cp "${FILESDIR}"/ldconfig.in "${T}" || die sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die into / @@ -131,7 +110,7 @@ pkg_postinst() { [ "${ROOT}" != "/" ] && return 0 - ldconfig + ldconfig || die # reload init ... /sbin/telinit U 2>/dev/null }