From 398a42634f34afa1979d88ae1d8b38194e911c2d Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 11 Dec 2019 13:32:00 +0100 Subject: */*: [QA] Remove redundant `|| die` guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Since all ebuilds in the tree are EAPI>=4, `|| die` on builtin commands is redundant and dead code. Closes: https://github.com/gentoo/gentoo/pull/13940 Reviewed-by: Ulrich Müller Reviewed-by: Michał Górny Reviewed-by: Andreas K. Hüttel Signed-off-by: David Seifert --- sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-3.2.ebuild | 9 ++++----- sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-8.1.ebuild | 11 +++++------ sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild | 11 +++++------ 12 files changed, 59 insertions(+), 71 deletions(-) (limited to 'sys-devel/binutils-apple') diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild index 6636b170fc58..fe828d3b1644 100644 --- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild @@ -158,8 +158,8 @@ compile_ld64() { [[ ${CHOST} == *-apple-darwin8 ]] && \ append-flags -isystem "${S}"/${CCTOOLS}/include/ local myincs="-Iinclude -Iabstraction -Ild" - emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}" \ - || die "emake failed for ld64" + emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}" + use test && emake build_test } @@ -171,13 +171,12 @@ compile_cctools() { EFITOOLS= \ COMMON_SUBDIRS='libstuff ar misc otool' \ SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" + RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" + RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild index e60586c9425b..4ccf5b257b9c 100644 --- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild @@ -134,7 +134,7 @@ compile_ld64() { # but not on tiger. [[ ${CHOST} == *-apple-darwin8 ]] && \ append-flags -isystem "${S}"/${CCTOOLS}/include/ - emake || die "emake failed for ld64" + emake use test && emake build_test } @@ -146,13 +146,12 @@ compile_cctools() { EFITOOLS= \ COMMON_SUBDIRS='libstuff ar misc otool' \ SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" + RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" + RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild index f959d52dadb7..b3cf69bdae49 100644 --- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild @@ -213,8 +213,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -232,15 +232,14 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - OFLAG="${CCTOOLS_OFLAG}" \ - || die "emake failed for as" + OFLAG="${CCTOOLS_OFLAG}" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild index e2bead82b9e7..73ec964cbefc 100644 --- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild @@ -253,8 +253,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -278,16 +278,15 @@ compile_cctools() { OFLAG="${CCTOOLS_OFLAG}" \ CXXLIB="${CXXLIB}" \ DSYMUTIL=": disabled: dsymutil" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild index 3e68d58f0b9f..041d9a329ada 100644 --- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild @@ -254,8 +254,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -279,16 +279,15 @@ compile_cctools() { OFLAG="${CCTOOLS_OFLAG}" \ CXXLIB="${CXXLIB}" \ DSYMUTIL=": disabled: dsymutil" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild index 2471067df89b..b3af64fe16d6 100644 --- a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild @@ -255,8 +255,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -280,16 +280,15 @@ compile_cctools() { OFLAG="${CCTOOLS_OFLAG}" \ CXXLIB="${CXXLIB}" \ DSYMUTIL=": disabled: dsymutil" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild index 26cdc62a049f..7607b1e4624c 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild @@ -240,8 +240,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -263,16 +263,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild index 1726e46df84b..46382b1d6785 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild @@ -240,8 +240,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -263,16 +263,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild index 2c95149c0179..e7e593598c92 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild @@ -241,8 +241,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -264,16 +264,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild index 6c1ac5689e24..9497b6024a8e 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild @@ -248,8 +248,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -271,16 +271,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild index ba6816417faf..945873754651 100644 --- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild @@ -182,8 +182,8 @@ compile_ld64() { cd "${S}"/${LD64}/src emake \ LTO=${ENABLE_LTO} \ - TAPI=$(use tapi && echo 1 || echo 0) \ - || die "emake failed for ld64" + TAPI=$(use tapi && echo 1 || echo 0) + use test && emake build_test } @@ -205,16 +205,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild index 2ff38c2b3909..f7a37367f25f 100644 --- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild @@ -201,8 +201,8 @@ compile_ld64() { LTO_INCDIR=${LLVM_INCDIR} \ LTO_LIBDIR=${LLVM_LIBDIR} \ TAPI=$(use tapi && echo 1 || echo 0) \ - TAPI_LIBDIR="${EPREFIX}"/usr/lib \ - || die "emake failed for ld64" + TAPI_LIBDIR="${EPREFIX}"/usr/lib + use test && emake build_test } @@ -223,16 +223,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { -- cgit v1.2.3-65-gdbad