From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3E40713888F for ; Wed, 21 Oct 2015 19:34:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6291DE07F0; Wed, 21 Oct 2015 19:34:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E794BE07F0 for ; Wed, 21 Oct 2015 19:34:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6DA3340901 for ; Wed, 21 Oct 2015 19:34:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FD3A159A for ; Wed, 21 Oct 2015 19:33:57 +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: <1445456409.c357084ea3f964cfd5822ad6d5d2bf95eac0b837.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.12.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: c357084ea3f964cfd5822ad6d5d2bf95eac0b837 X-VCS-Branch: master Date: Wed, 21 Oct 2015 19:33:57 +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: f561bad9-e975-4662-9404-f3227bc08186 X-Archives-Hash: 04830a94071fe41d8eb691016c75a970 commit: c357084ea3f964cfd5822ad6d5d2bf95eac0b837 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Oct 21 19:38:13 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Oct 21 19:40:09 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c357084e sys-libs/musl: cleanup wrt `|| die` Thanks hasufell. Package-Manager: portage-2.2.20.1 sys-libs/musl/musl-1.1.12.ebuild | 12 ++++++------ sys-libs/musl/musl-9999.ebuild | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys-libs/musl/musl-1.1.12.ebuild b/sys-libs/musl/musl-1.1.12.ebuild index f7c9ef0..8de636c 100644 --- a/sys-libs/musl/musl-1.1.12.ebuild +++ b/sys-libs/musl/musl-1.1.12.ebuild @@ -78,16 +78,16 @@ src_configure() { } src_compile() { - emake include/bits/alltypes.h || die + emake include/bits/alltypes.h just_headers && return 0 - emake || die + emake } src_install() { local target="install" just_headers && target="install-headers" - emake DESTDIR="${D}" ${target} || die + emake DESTDIR="${D}" ${target} just_headers && return 0 # musl provides ldd via a sym link to its ld.so @@ -106,13 +106,13 @@ src_install() { ppc) arch="powerpc";; x86) arch="i386";; esac - cp "${FILESDIR}"/ldconfig.in "${T}" - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig + cp "${FILESDIR}"/ldconfig.in "${T}" || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die into / dosbin "${T}"/ldconfig into /usr dobin "${FILESDIR}"/getent - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die doenvd "${T}"/00musl || die fi } diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index f7c9ef0..8de636c 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -78,16 +78,16 @@ src_configure() { } src_compile() { - emake include/bits/alltypes.h || die + emake include/bits/alltypes.h just_headers && return 0 - emake || die + emake } src_install() { local target="install" just_headers && target="install-headers" - emake DESTDIR="${D}" ${target} || die + emake DESTDIR="${D}" ${target} just_headers && return 0 # musl provides ldd via a sym link to its ld.so @@ -106,13 +106,13 @@ src_install() { ppc) arch="powerpc";; x86) arch="i386";; esac - cp "${FILESDIR}"/ldconfig.in "${T}" - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig + cp "${FILESDIR}"/ldconfig.in "${T}" || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die into / dosbin "${T}"/ldconfig into /usr dobin "${FILESDIR}"/getent - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die doenvd "${T}"/00musl || die fi }