Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/
Date: Sat, 20 Apr 2019 23:24:47
Message-Id: 1555768269.d1b515c88db3255d192e5d469f90405eb2bd33b9.polynomial-c@gentoo
1 commit: d1b515c88db3255d192e5d469f90405eb2bd33b9
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 20 13:51:09 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 20 13:51:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b515c8
7
8 dev-util/kbuild: Don't build with distcc
9
10 Closes: https://bugs.gentoo.org/255371
11 Package-Manager: Portage-2.3.64, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 dev-util/kbuild/kbuild-0.1.9998.3149.ebuild | 7 ++++++-
15 dev-util/kbuild/kbuild-9999.ebuild | 7 ++++++-
16 2 files changed, 12 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
19 index 7c358202b88..4ed9922800e 100644
20 --- a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
21 +++ b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2018 Gentoo Authors
24 +# Copyright 1999-2019 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28 @@ -32,6 +32,11 @@ PATCHES=(
29 "${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
30 )
31
32 +pkg_setup() {
33 + # Package fails with distcc (bug #255371)
34 + export DISTCC_DISABLE=1
35 +}
36 +
37 src_prepare() {
38 rm -rf "${S}/kBuild/bin"
39
40
41 diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
42 index ccbf4507612..ac794242d86 100644
43 --- a/dev-util/kbuild/kbuild-9999.ebuild
44 +++ b/dev-util/kbuild/kbuild-9999.ebuild
45 @@ -1,4 +1,4 @@
46 -# Copyright 1999-2018 Gentoo Authors
47 +# Copyright 1999-2019 Gentoo Authors
48 # Distributed under the terms of the GNU General Public License v2
49
50 EAPI=6
51 @@ -20,6 +20,11 @@ RDEPEND=""
52
53 S="${WORKDIR}/${MY_P/-src}"
54
55 +pkg_setup() {
56 + # Package fails with distcc (bug #255371)
57 + export DISTCC_DISABLE=1
58 +}
59 +
60 src_prepare() {
61 default
62 rm -rf "${S}/kBuild/bin" || die