| 1 |
commit: 61c6b4e97824f4547983dffead5ca392d825cbbc |
| 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:57:15 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=61c6b4e9 |
| 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.9999.ebuild | 8 ++++++-- |
| 16 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild |
| 19 |
index 2c200df5..3f5a4cb4 100644 |
| 20 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild |
| 21 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.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 |
} |
Archives