Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: gkbuilds/
Date: Wed, 02 Oct 2019 22:45:33
Message-Id: 1569799430.074b43e3ede4b1c161a64937f32c815fcee4d8c8.whissi@gentoo
1 commit: 074b43e3ede4b1c161a64937f32c815fcee4d8c8
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 29 23:18:34 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 29 23:23:50 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=074b43e3
7
8 gkbuilds/boost{,-build}: Disable distcc usage
9
10 It's known that distcc cannot really compile boost: It will always
11 fallback to local processing -- even in pump mode.
12
13 However, when user normally uses distcc, user has probably set higher
14 parallel jobs (MAKEOPTS) than available processing units which could
15 kill the system running genkernel.
16
17 DISABLE_DISTCC=yes will limit distcc to localhost and adjust MAKEOPTS
18 if necessary only for this gkbuild.
19
20 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
21
22 gkbuilds/boost-build.gkbuild | 4 ++++
23 gkbuilds/boost.gkbuild | 4 ++++
24 2 files changed, 8 insertions(+)
25
26 diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild
27 index b2883ed..baf1811 100644
28 --- a/gkbuilds/boost-build.gkbuild
29 +++ b/gkbuilds/boost-build.gkbuild
30 @@ -1,6 +1,10 @@
31 # Copyright 1999-2019 Gentoo Authors
32 # Distributed under the terms of the GNU General Public License v2
33
34 +# distcc is known to fail compiling boost and will fallback
35 +# to local processing; Even when using distcc pump mode.
36 +DISABLE_DISTCC=yes
37 +
38 MY_PV="${PV//./_}"
39 S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
40 QA_IGNORE_DYNAMICALLY_LINKED_PROGRAM='(bjam|b2)$'
41
42 diff --git a/gkbuilds/boost.gkbuild b/gkbuilds/boost.gkbuild
43 index 8b1012b..a796e0f 100644
44 --- a/gkbuilds/boost.gkbuild
45 +++ b/gkbuilds/boost.gkbuild
46 @@ -1,6 +1,10 @@
47 # Copyright 1999-2019 Gentoo Authors
48 # Distributed under the terms of the GNU General Public License v2
49
50 +# distcc is known to fail compiling boost and will fallback
51 +# to local processing; Even when using distcc pump mode.
52 +DISABLE_DISTCC=yes
53 +
54 create_user-config.jam() {
55 local user_config_jam="${S}"/user-config.jam
56 if [[ -s ${user_config_jam} ]]; then