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 39/41] gnustep-base.eclass: remove useless || die on emake
Date: Sun, 25 Dec 2022 22:26:03
Message-Id: 20221225221552.8023-39-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/gnustep-base.eclass | 8 ++++----
4 1 file changed, 4 insertions(+), 4 deletions(-)
5
6 diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
7 index 5e839bd0702..f967a527282 100644
8 --- a/eclass/gnustep-base.eclass
9 +++ b/eclass/gnustep-base.eclass
10 @@ -172,7 +172,7 @@ egnustep_env() {
11 # Make utilizing GNUstep Makefiles
12 egnustep_make() {
13 if [[ -f ./Makefile || -f ./makefile || -f ./GNUmakefile ]] ; then
14 - emake ${*} "${GS_ENV[@]}" all || die "package make failed"
15 + emake ${*} "${GS_ENV[@]}" all
16 return 0
17 fi
18 die "no Makefile found"
19 @@ -185,7 +185,7 @@ egnustep_install() {
20 mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS}
21 fi
22 if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
23 - emake ${*} "${GS_ENV[@]}" install || die "package install failed"
24 + emake ${*} "${GS_ENV[@]}" install
25 return 0
26 fi
27 die "no Makefile found"
28 @@ -197,8 +197,8 @@ egnustep_doc() {
29 # Check documentation presence
30 pushd "${S}"/Documentation || die
31 if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
32 - emake "${GS_ENV[@]}" all || die "doc make failed"
33 - emake "${GS_ENV[@]}" install || die "doc install failed"
34 + emake "${GS_ENV[@]}" all
35 + emake "${GS_ENV[@]}" install
36 fi
37 popd || die
38 fi
39 --
40 2.39.0