Gentoo Archives: gentoo-dev

From: David Seifert <soap@g.o>
To: gentoo-dev@l.g.o
Cc: David Seifert <soap@g.o>
Subject: [gentoo-dev] [PATCH 41/41] xorg-3.eclass: remove useless || die on emake
Date: Sun, 25 Dec 2022 22:26:34
Message-Id: 20221225221552.8023-41-soap@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/41] ada.eclass: drop EAPI 6 support by David Seifert
1 Signed-off-by: David Seifert <soap@g.o>
2 ---
3 eclass/xorg-3.eclass | 8 ++++----
4 1 file changed, 4 insertions(+), 4 deletions(-)
5
6 diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
7 index 0d35c0a8ebf..a63655e10ec 100644
8 --- a/eclass/xorg-3.eclass
9 +++ b/eclass/xorg-3.eclass
10 @@ -415,7 +415,7 @@ xorg-3_src_configure() {
11 }
12
13 multilib_src_compile() {
14 - emake "$@" || die 'emake failed'
15 + emake "$@"
16 }
17
18 # @FUNCTION: xorg-3_src_compile
19 @@ -427,12 +427,12 @@ xorg-3_src_compile() {
20 if [[ ${XORG_MULTILIB} == yes ]]; then
21 multilib-minimal_src_compile "$@"
22 else
23 - emake "$@" || die 'emake failed'
24 + emake "$@"
25 fi
26 }
27
28 multilib_src_install() {
29 - emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed"
30 + emake DESTDIR="${D}" "${install_args[@]}" "$@" install
31 }
32
33 # @FUNCTION: xorg-3_src_install
34 @@ -446,7 +446,7 @@ xorg-3_src_install() {
35 if [[ ${XORG_MULTILIB} == yes ]]; then
36 multilib-minimal_src_install "$@"
37 else
38 - emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed"
39 + emake DESTDIR="${D}" "${install_args[@]}" "$@" install
40 einstalldocs
41 fi
42
43 --
44 2.39.0