diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2015-10-21 15:38:13 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-10-21 15:40:09 -0400 |
| commit | c357084ea3f964cfd5822ad6d5d2bf95eac0b837 (patch) | |
| tree | bc26a532aa43103f635681277e3be52277b845c9 /sys-libs | |
| parent | dev-db/sqlite: Version bump. (diff) | |
| download | gentoo-c357084ea3f964cfd5822ad6d5d2bf95eac0b837.tar.gz gentoo-c357084ea3f964cfd5822ad6d5d2bf95eac0b837.tar.bz2 gentoo-c357084ea3f964cfd5822ad6d5d2bf95eac0b837.zip | |
sys-libs/musl: cleanup wrt `|| die`
Thanks hasufell.
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/musl/musl-1.1.12.ebuild | 12 | ||||
| -rw-r--r-- | 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 f7c9ef03dd2e..8de636cd7a78 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 f7c9ef03dd2e..8de636cd7a78 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 } |