sys-libs/musl: cleanup wrt `|| die`
authorAnthony G. Basile <blueness@gentoo.org>
Wed, 21 Oct 2015 19:38:13 +0000 (15:38 -0400)
committerAnthony G. Basile <blueness@gentoo.org>
Wed, 21 Oct 2015 19:40:09 +0000 (15:40 -0400)
Thanks hasufell.

Package-Manager: portage-2.2.20.1

sys-libs/musl/musl-1.1.12.ebuild
sys-libs/musl/musl-9999.ebuild

index f7c9ef03dd2e76ee0f0fe3c2f6d0cd8e431aefa4..8de636cd7a78d45aa54d5ca53107bb776d98d67b 100644 (file)
@@ -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
 }
index f7c9ef03dd2e76ee0f0fe3c2f6d0cd8e431aefa4..8de636cd7a78d45aa54d5ca53107bb776d98d67b 100644 (file)
@@ -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
 }