summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
committerDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
commit398a42634f34afa1979d88ae1d8b38194e911c2d (patch)
treed6a45bdf7b35b71c192602a46e8d98d12a88cb02 /media-plugins/live/live-2018.01.29.ebuild
parentdev-ros/geometric_shapes: Remove old (diff)
downloadgentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.gz
gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.bz2
gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.zip
*/*: [QA] Remove redundant `|| die` guards
* 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 <ulm@gentoo.org> Reviewed-by: Michał Górny <mgorny@gentoo.org> Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-plugins/live/live-2018.01.29.ebuild')
-rw-r--r--media-plugins/live/live-2018.01.29.ebuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/media-plugins/live/live-2018.01.29.ebuild b/media-plugins/live/live-2018.01.29.ebuild
index be60aaac501..d833ddf75eb 100644
--- a/media-plugins/live/live-2018.01.29.ebuild
+++ b/media-plugins/live/live-2018.01.29.ebuild
@@ -83,14 +83,14 @@ multilib_src_compile() {
einfo "Beginning static library build"
./genMakefiles gentoo
- emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+ emake -j1 LINK_OPTS="-L. $(raw-ldflags)"
fi
cd "${BUILD_DIR}/live-shared"
einfo "Beginning shared library build"
./genMakefiles gentoo-so-r1
local suffix=$(get_libname ${LIVE_ABI_VERSION})
- emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+ emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}"
for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
@@ -102,7 +102,7 @@ multilib_src_compile() {
einfo "Beginning programs build"
for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
cd "${BUILD_DIR}/live-shared/${i}"
- emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+ emake LINK_OPTS="-L. ${LDFLAGS}"
done
fi
}