Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
Date: Thu, 06 Jan 2022 19:59:57
Message-Id: 1641499183.2b2510ae5cffece67dc8b03cd463d23eaaa3bebe.sam@gentoo
1 commit: 2b2510ae5cffece67dc8b03cd463d23eaaa3bebe
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 6 19:53:32 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 6 19:59:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2510ae
7
8 dev-qt/qtwebengine: disable CHECKREQS_MEMORY for distcc
9
10 It's harder to calculate properly for this case.
11
12 Bug: https://bugs.gentoo.org/830661
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild | 8 ++++++--
16 1 file changed, 6 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
19 index 3baacbff39c9..55f8f5631a65 100644
20 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
21 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2021 Gentoo Authors
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=8
28 @@ -136,7 +136,11 @@ qtwebengine_check-reqs() {
29
30 local CHECKREQS_DISK_BUILD="7G"
31 local CHECKREQS_DISK_USR="150M"
32 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
33 + if ! has "distcc" ${FEATURES} ; then
34 + # bug #830661
35 + # Not super realistic to come up with good estimates for distcc right now
36 + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
37 + fi
38
39 check-reqs_${EBUILD_PHASE_FUNC}
40 }