public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
Date: Thu,  6 Jan 2022 19:57:55 +0000 (UTC)	[thread overview]
Message-ID: <1641499034.c2e5a02f2ecd0af162b6598e718058a2420c9a05.sam@gentoo> (raw)

commit:     c2e5a02f2ecd0af162b6598e718058a2420c9a05
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 21:07:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 19:57:14 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c2e5a02f

dev-qt/qtwebengine: add check-reqs for disk space and memory usage

For now, assumes:
- RAM/memory: 2GB per job for GCC, 1.5GB per job for Clang
- Disk (build): 7GB
- Disk (installed): 150MB

(Also moves pkg_preinst to the end of the ebuild to reflect
phase execution order, as per devmanual.)

Closes: https://bugs.gentoo.org/570534
Thanks-to: Ionen Wolkens <ionen <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 61 +++++++++++++++++------
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 381ae491..2c200df5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml(+)"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 HOMEPAGE="https://www.qt.io/"
@@ -110,29 +110,47 @@ PATCHES=(
 	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
 )
 
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
-	elog "additional security fixes from newer versions. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
-	# bug 307861
+qtwebengine_check-reqs() {
+	# bug #307861
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn
 		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
 		ewarn "You may experience really long compilation times and/or increased memory usage."
 		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-		ewarn
 	fi
 	eshopts_pop
 
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# (check-reqs added for bug #570534)
+	#
+	# Estimate the amount of RAM required
+	# Multiplier is *10 because Bash doesn't do floating point maths.
+	# Let's crudely assume ~2GB per compiler job for GCC.
+	local multiplier=20
+
+	# And call it ~1.5GB for Clang.
+	if tc-is-clang ; then
+		multiplier=15
+	fi
+
+	local CHECKREQS_DISK_BUILD="7G"
+	local CHECKREQS_DISK_USR="150M"
+	local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	qtwebengine_check-reqs
+}
+
+pkg_setup() {
+	qtwebengine_check-reqs
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
 	case ${QT5_BUILD_TYPE} in
 		live)    git-r3_src_unpack ;&
 		release) default ;;
@@ -231,3 +249,14 @@ src_install() {
 		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
 	fi
 }
+
+pkg_preinst() {
+	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+	elog "additional security fixes from newer versions. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tldr: Your web browsing experience will be compromised."
+}


             reply	other threads:[~2022-01-06 19:57 UTC|newest]

Thread overview: 146+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-06 19:57 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-12 15:20 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ Andreas Sturmlechner
2024-05-30 12:56 Andreas Sturmlechner
2024-05-28 19:34 Andreas Sturmlechner
2024-03-23 13:35 Andreas Sturmlechner
2024-03-16 15:40 Andreas Sturmlechner
2024-03-16 15:40 Andreas Sturmlechner
2024-01-13 16:45 Sam James
2023-12-30 14:03 Andreas Sturmlechner
2023-11-11 20:24 Andreas Sturmlechner
2023-11-11 20:24 Andreas Sturmlechner
2023-10-08 11:58 Andreas Sturmlechner
2023-04-15 17:16 Jimi Huotari
2023-04-15 17:16 Jimi Huotari
2022-12-16 21:05 Jimi Huotari
2022-11-05 16:39 Andreas Sturmlechner
2022-10-14 20:24 Jimi Huotari
2022-10-06 16:20 Sam James
2022-09-24 21:24 Andreas Sturmlechner
2022-09-24 17:03 Andreas Sturmlechner
2022-09-18 11:55 Jimi Huotari
2022-07-17  7:13 Andreas Sturmlechner
2022-06-20 18:03 Jimi Huotari
2022-06-18 14:27 Andreas Sturmlechner
2022-05-14 21:15 Andreas Sturmlechner
2022-04-12 12:43 Jimi Huotari
2022-04-09 16:01 Andreas Sturmlechner
2022-03-21  8:14 Jimi Huotari
2022-03-04  9:51 Andreas Sturmlechner
2022-01-06 19:57 Sam James
2021-12-26 22:13 Jimi Huotari
2021-12-25  0:03 Andreas Sturmlechner
2021-12-24 23:57 Andreas Sturmlechner
2021-12-24 23:18 Andreas Sturmlechner
2021-12-09 13:53 Jimi Huotari
2021-12-09 13:53 Jimi Huotari
2021-12-01 19:09 Jimi Huotari
2021-10-16 15:36 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-23  7:29 Andreas Sturmlechner
2021-09-15 20:01 Davide Pesavento
2021-09-15  7:39 Andreas Sturmlechner
2021-09-08  8:17 Andreas Sturmlechner
2021-08-26 12:10 Andreas Sturmlechner
2021-08-20 12:36 Andreas Sturmlechner
2021-07-03 14:44 Andreas Sturmlechner
2021-07-03 14:44 Andreas Sturmlechner
2021-07-03 14:44 Andreas Sturmlechner
2021-06-24 11:19 Jimi Huotari
2021-04-19 10:53 Andreas Sturmlechner
2021-04-19 10:53 Andreas Sturmlechner
2021-04-14  6:54 Jimi Huotari
2021-03-14 15:36 Andreas Sturmlechner
2021-02-12 20:45 Andreas Sturmlechner
2021-02-05 22:05 Andreas Sturmlechner
2021-02-02  0:41 Andreas Sturmlechner
2021-01-15 15:02 Jimi Huotari
2020-11-25 22:22 Andreas Sturmlechner
2020-09-10 17:49 Andreas Sturmlechner
2020-09-10 17:49 Andreas Sturmlechner
2020-04-29 16:02 Andreas Sturmlechner
2020-04-09 20:38 Jimi Huotari
2020-04-09 17:32 Andreas Sturmlechner
2020-04-09 17:32 Andreas Sturmlechner
2020-02-11  7:47 Jimi Huotari
2020-01-29 22:48 Jimi Huotari
2020-01-29  1:53 Jimi Huotari
2020-01-29  1:53 Jimi Huotari
2020-01-28  2:09 Jimi Huotari
2019-09-24 20:55 Jimi Huotari
2019-08-18 11:44 Andreas Sturmlechner
2019-06-20 21:17 Andreas Sturmlechner
2019-05-14 12:57 Michael Palimaka
2019-04-25  2:30 Michael Palimaka
2019-04-20 20:10 Andreas Sturmlechner
2019-02-19 16:58 Jimi Huotari
2019-02-03  5:15 Jimi Huotari
2018-12-17 11:49 Jimi Huotari
2018-12-16 19:01 Andreas Sturmlechner
2018-11-13 17:52 Andreas Sturmlechner
2018-10-17 16:47 Jimi Huotari
2018-09-18 15:02 Jimi Huotari
2018-09-09 18:21 Jimi Huotari
2018-08-25  4:04 Jimi Huotari
2018-08-24 23:43 Jimi Huotari
2018-08-16 12:20 Jimi Huotari
2018-07-25 23:20 Jimi Huotari
2018-06-21 10:15 Jimi Huotari
2018-06-21  9:16 Jimi Huotari
2018-06-18 14:04 Jimi Huotari
2018-06-12 22:55 Andreas Sturmlechner
2018-05-27 16:56 Jimi Huotari
2018-05-16 14:22 Jimi Huotari
2018-04-17 10:23 Jimi Huotari
2018-04-15  7:53 Jimi Huotari
2018-04-11 12:56 Jimi Huotari
2018-04-03  3:15 Jimi Huotari
2018-04-03  3:15 Jimi Huotari
2018-03-17  2:49 Jimi Huotari
2018-03-17  2:49 Jimi Huotari
2018-02-10 21:33 Jimi Huotari
2018-01-15 11:06 Michael Palimaka
2018-01-04 21:24 Jimi Huotari
2018-01-04 13:10 Michael Palimaka
2017-12-23  0:44 Michael Palimaka
2017-12-11 11:37 Jimi Huotari
2017-12-10 12:03 Michael Palimaka
2017-12-09 23:37 Jimi Huotari
2017-12-07  9:08 Michael Palimaka
2017-11-28 10:48 Michael Palimaka
2017-10-10 12:30 Michael Palimaka
2017-10-10 12:30 Michael Palimaka
2017-09-12 15:27 Michael Palimaka
2017-09-08 15:52 Michael Palimaka
2017-07-23 12:37 Michael Palimaka
2017-06-27 13:02 Michael Palimaka
2017-06-18  8:02 Michael Palimaka
2017-06-05 12:41 Michael Palimaka
2017-06-04 13:32 Michael Palimaka
2017-06-04 12:59 Michael Palimaka
2017-06-04 12:13 Michael Palimaka
2017-06-04 11:40 Michael Palimaka
2017-06-04 11:40 Michael Palimaka
2017-06-03 16:01 Michael Palimaka
2017-05-14  2:15 Davide Pesavento
2017-05-14  2:15 Davide Pesavento
2017-04-25 20:15 Davide Pesavento
2017-04-25 20:15 Davide Pesavento
2016-12-09 14:16 Michael Palimaka
2016-12-06  6:57 Michael Palimaka
2016-12-03  1:16 Davide Pesavento
2016-12-01 14:03 Michael Palimaka
2016-09-06 18:12 Davide Pesavento
2016-09-01 12:38 Michael Palimaka
2016-08-31 18:23 Michael Palimaka
2016-05-12 13:52 Michael Palimaka
2016-04-19 19:54 Davide Pesavento
2016-04-19 19:54 Davide Pesavento
2016-04-19 19:54 Davide Pesavento
2016-03-09 11:58 Michael Palimaka
2016-01-17 19:16 Michael Palimaka
2016-01-13 18:56 Michael Palimaka
2016-01-13 16:04 Michael Palimaka
2016-01-13 15:59 Michael Palimaka
2016-01-13 15:54 Michael Palimaka
2016-01-13  8:07 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1641499034.c2e5a02f2ecd0af162b6598e718058a2420c9a05.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox