From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A1E6158086 for ; Thu, 6 Jan 2022 19:57:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0F2B2BC007; Thu, 6 Jan 2022 19:57:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2580E07E0 for ; Thu, 6 Jan 2022 19:57:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D09B9342E80 for ; Thu, 6 Jan 2022 19:57:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47063275 for ; Thu, 6 Jan 2022 19:57:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1641499035.61c6b4e97824f4547983dffead5ca392d825cbbc.sam@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 61c6b4e97824f4547983dffead5ca392d825cbbc X-VCS-Branch: master Date: Thu, 6 Jan 2022 19:57:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 788a032e-fb25-4536-97c3-1ab2c00bd1c4 X-Archives-Hash: 479a9e673e48658d5842849e60815444 commit: 61c6b4e97824f4547983dffead5ca392d825cbbc Author: Sam James gentoo org> AuthorDate: Thu Jan 6 19:53:32 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 6 19:57:15 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=61c6b4e9 dev-qt/qtwebengine: disable CHECKREQS_MEMORY for distcc It's harder to calculate properly for this case. Bug: https://bugs.gentoo.org/830661 Signed-off-by: Sam James gentoo.org> dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild index 2c200df5..3f5a4cb4 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -136,7 +136,11 @@ qtwebengine_check-reqs() { local CHECKREQS_DISK_BUILD="7G" local CHECKREQS_DISK_USR="150M" - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G + if ! has "distcc" ${FEATURES} ; then + # bug #830661 + # Not super realistic to come up with good estimates for distcc right now + local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G + fi check-reqs_${EBUILD_PHASE_FUNC} }