Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
Date: Mon, 01 Mar 2021 19:44:39
Message-Id: 1614627866.8f24ae86e614567ae2ffcd316a2115da31d72214.sam@gentoo
1 commit: 8f24ae86e614567ae2ffcd316a2115da31d72214
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 1 19:44:07 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 1 19:44:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f24ae86
7
8 games-strategy/0ad: pass JOBS as env var
9
10 Closes: https://bugs.gentoo.org/773622
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 10 +++++++---
14 1 file changed, 7 insertions(+), 3 deletions(-)
15
16 diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
17 index 803df28d90d..a0468ee4b3e 100644
18 --- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
19 +++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
20 @@ -143,7 +143,7 @@ src_compile() {
21 if use nvtt ; then
22 cd libraries/source/nvtt || die
23 elog "Building bundled NVTT (bug #768930)"
24 - ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled NVTT"
25 + JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
26 cd "${S}" || die
27 fi
28
29 @@ -153,12 +153,16 @@ src_compile() {
30 # e.g. bug #768840.
31 cd libraries/source/spidermonkey || die
32 elog "Building bundled SpiderMonkey (bug #768840)"
33 - XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled SpiderMonkey"
34 + XARGS="${EPREFIX}/usr/bin/xargs" \
35 + JOBS="-j$(makeopts_jobs)" \
36 + ./build.sh \
37 + || die "Failed to build bundled SpiderMonkey"
38 +
39 cd "${S}" || die
40
41 # Build 0ad itself!
42 elog "Building 0ad"
43 - emake -C build/workspaces/gcc verbose=1 JOBS="-j$(makeopts_jobs)"
44 + JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc verbose=1
45
46 # Build assets
47 # (We only do this if we're using a snapshot/non-release)