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] repo/gentoo:master commit in: dev-qt/qtwebengine/
Date: Tue,  4 Jan 2022 21:08:25 +0000 (UTC)	[thread overview]
Message-ID: <1641330478.2b134e09a3ab94f3c33419cf0b8114d004cec477.sam@gentoo> (raw)

commit:     2b134e09a3ab94f3c33419cf0b8114d004cec477
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: Tue Jan  4 21:07:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b134e09

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>

 .../qtwebengine-5.15.2_p20211216.ebuild            | 61 ++++++++++++++++------
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
index 7923a290ab0e..3baacbff39c9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.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-04 21:08 UTC|newest]

Thread overview: 301+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-04 21:08 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-23 11:36 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ Andreas Sturmlechner
2024-11-21 21:39 Andreas Sturmlechner
2024-10-09 14:14 Ionen Wolkens
2024-10-09  6:22 Ionen Wolkens
2024-10-08  5:03 Ionen Wolkens
2024-09-27  7:26 Ionen Wolkens
2024-09-25  2:20 Ionen Wolkens
2024-09-24  9:57 Ionen Wolkens
2024-09-22  8:16 Ionen Wolkens
2024-09-03  7:44 Ionen Wolkens
2024-09-03  7:44 Ionen Wolkens
2024-09-03  0:31 Ionen Wolkens
2024-09-02 17:52 Ionen Wolkens
2024-07-23  7:50 Ionen Wolkens
2024-07-16  1:29 Ionen Wolkens
2024-07-08 11:16 Arthur Zamarin
2024-06-21  1:10 Ionen Wolkens
2024-06-21  0:56 Ionen Wolkens
2024-06-18 18:14 Ionen Wolkens
2024-06-11 22:02 Ionen Wolkens
2024-06-11 22:02 Ionen Wolkens
2024-06-08  5:27 Arthur Zamarin
2024-06-06 16:43 Andreas Sturmlechner
2024-06-04 19:36 Ionen Wolkens
2024-06-02  4:04 Sam James
2024-06-01 10:25 Arthur Zamarin
2024-05-31  6:12 Andreas Sturmlechner
2024-05-30 12:52 Andreas Sturmlechner
2024-05-30 12:52 Andreas Sturmlechner
2024-05-23  3:36 Arthur Zamarin
2024-05-22 17:03 Sam James
2024-05-21  6:53 Ionen Wolkens
2024-05-20  8:49 Ionen Wolkens
2024-05-17 10:08 Ionen Wolkens
2024-05-17  4:32 Ionen Wolkens
2024-05-15 18:08 Andreas Sturmlechner
2024-05-13  5:49 Ionen Wolkens
2024-05-10 10:26 Ionen Wolkens
2024-05-09 12:13 Ionen Wolkens
2024-05-08 16:18 Ionen Wolkens
2024-04-23 15:08 Ionen Wolkens
2024-04-14 15:06 Ionen Wolkens
2024-04-13 18:06 Ionen Wolkens
2024-04-13 17:50 Arthur Zamarin
2024-04-05 15:01 Andreas Sturmlechner
2024-04-04  4:23 Arthur Zamarin
2024-04-03 17:30 Ionen Wolkens
2024-04-03 17:01 Ionen Wolkens
2024-04-03 15:25 Andreas Sturmlechner
2024-04-02 13:06 Ionen Wolkens
2024-04-02  6:09 Arthur Zamarin
2024-04-01 18:29 Arthur Zamarin
2024-03-30  0:29 Ionen Wolkens
2024-03-30  0:29 Ionen Wolkens
2024-03-30  0:29 Ionen Wolkens
2024-03-26  7:10 Ionen Wolkens
2024-03-24 18:39 Ionen Wolkens
2024-03-23 17:01 Andreas Sturmlechner
2024-03-22  6:16 Arthur Zamarin
2024-03-12 20:32 Ionen Wolkens
2024-03-12 20:32 Ionen Wolkens
2024-03-12 12:01 Ionen Wolkens
2024-03-04 14:53 Ionen Wolkens
2024-02-22  6:16 Ionen Wolkens
2024-02-22  6:16 Ionen Wolkens
2024-02-20 14:30 Arthur Zamarin
2024-02-14 12:24 Ionen Wolkens
2024-01-31  7:18 Joonas Niilola
2024-01-29 14:38 Ionen Wolkens
2024-01-29  4:22 Ionen Wolkens
2024-01-24 14:49 Ionen Wolkens
2024-01-22 19:38 Andreas Sturmlechner
2024-01-15 21:59 Andreas Sturmlechner
2024-01-10  9:15 Ionen Wolkens
2024-01-09 14:08 Ionen Wolkens
2024-01-08 16:43 Ionen Wolkens
2024-01-08 12:59 Ionen Wolkens
2024-01-01 21:14 Andreas Sturmlechner
2023-12-24  8:28 Ionen Wolkens
2023-12-22 22:40 Mart Raudsepp
2023-12-17 18:29 Arthur Zamarin
2023-12-13  3:12 Ionen Wolkens
2023-12-12 21:25 Ionen Wolkens
2023-11-27  8:47 Ionen Wolkens
2023-11-27  8:47 Ionen Wolkens
2023-11-25 16:12 Andreas Sturmlechner
2023-11-23  8:16 Ionen Wolkens
2023-11-22 15:21 Ionen Wolkens
2023-11-22 15:21 Ionen Wolkens
2023-11-21 21:25 Ionen Wolkens
2023-11-21 19:53 Sam James
2023-11-15 19:28 Ionen Wolkens
2023-11-15 17:20 Arthur Zamarin
2023-11-08 19:48 Andreas Sturmlechner
2023-11-08 19:48 Andreas Sturmlechner
2023-11-06 18:11 Andreas Sturmlechner
2023-11-03 11:16 Andreas Sturmlechner
2023-11-03 11:16 Andreas Sturmlechner
2023-10-22  8:36 Andreas Sturmlechner
2023-10-17 13:25 Ionen Wolkens
2023-10-10 14:51 Ionen Wolkens
2023-10-08 15:58 Andreas Sturmlechner
2023-09-28 13:07 Ionen Wolkens
2023-09-26 19:48 Ionen Wolkens
2023-09-26 15:16 Ionen Wolkens
2023-09-22 20:18 Ionen Wolkens
2023-09-22  4:46 Ionen Wolkens
2023-09-20 18:27 Ionen Wolkens
2023-09-18 20:04 Arthur Zamarin
2023-09-16 10:50 Ionen Wolkens
2023-09-15  4:49 Sam James
2023-09-14 20:43 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-09 16:22 Ionen Wolkens
2023-09-07 20:37 Ionen Wolkens
2023-09-06  1:28 Ionen Wolkens
2023-09-05 13:05 Ionen Wolkens
2023-09-05 13:05 Ionen Wolkens
2023-08-26 11:56 Andreas Sturmlechner
2023-07-21  2:52 Jimi Huotari
2023-07-20 19:41 Jimi Huotari
2023-07-13  8:42 Andreas Sturmlechner
2023-07-09 17:00 Arthur Zamarin
2023-07-06 17:17 Andreas Sturmlechner
2023-06-13 11:42 Andreas Sturmlechner
2023-05-22 18:36 Arthur Zamarin
2023-05-21 23:08 Sam James
2023-05-21  7:05 Andreas Sturmlechner
2023-05-06 11:39 Jimi Huotari
2023-05-06 11:26 Jimi Huotari
2023-05-01 12:54 Andreas Sturmlechner
2023-04-23 16:00 Arthur Zamarin
2023-04-17 19:39 Jimi Huotari
2023-04-15 18:39 Jimi Huotari
2023-04-13 21:45 Andreas Sturmlechner
2023-04-09 19:34 Arthur Zamarin
2023-04-09 19:25 Arthur Zamarin
2023-03-29 15:41 Andreas Sturmlechner
2023-03-26 16:59 Jimi Huotari
2023-03-19 16:47 Jimi Huotari
2023-03-19 13:09 Jimi Huotari
2023-02-09 10:02 Andreas Sturmlechner
2023-02-07 10:37 Andreas Sturmlechner
2023-01-24  9:45 Andreas Sturmlechner
2023-01-21  9:15 Arthur Zamarin
2023-01-17 20:56 Arthur Zamarin
2023-01-17 20:04 Sam James
2023-01-15 12:36 Andreas Sturmlechner
2023-01-15 12:36 Andreas Sturmlechner
2023-01-05 22:39 Jimi Huotari
2022-12-06 17:07 Andreas Sturmlechner
2022-12-04 19:22 Arthur Zamarin
2022-12-03 20:37 Arthur Zamarin
2022-12-03 11:02 Sam James
2022-12-01 19:19 Andreas Sturmlechner
2022-11-29 20:51 Andreas Sturmlechner
2022-10-06 16:15 Sam James
2022-09-24 14:32 Andreas Sturmlechner
2022-07-20  5:15 Sam James
2022-07-06 10:27 Andreas Sturmlechner
2022-07-04 18:00 Arthur Zamarin
2022-07-02 18:26 Sam James
2022-06-30 22:19 Sam James
2022-06-19 12:26 Andreas Sturmlechner
2022-06-14 17:32 Andreas Sturmlechner
2022-06-14 13:27 Sam James
2022-06-14 13:15 Andreas Sturmlechner
2022-06-14  7:21 Agostino Sarubbo
2022-06-10  7:49 Georgy Yakovlev
2022-06-10  3:16 Sam James
2022-05-30 16:09 Andreas Sturmlechner
2022-05-26 19:35 Andreas Sturmlechner
2022-05-01  7:30 Michał Górny
2022-04-15 20:15 Andreas Sturmlechner
2022-04-14  0:19 Sam James
2022-04-12 22:49 Sam James
2022-04-12 19:35 Arthur Zamarin
2022-03-30  5:52 Andreas Sturmlechner
2022-03-21 11:04 Andreas Sturmlechner
2022-01-06 19:59 Sam James
2021-12-28  6:00 Sam James
2021-12-27 14:14 Agostino Sarubbo
2021-12-26  8:07 Agostino Sarubbo
2021-12-25  0:10 Andreas Sturmlechner
2021-12-14 18:13 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-11-09 23:54 Sam James
2021-11-09 22:40 Georgy Yakovlev
2021-11-08 10:11 Agostino Sarubbo
2021-11-06  1:35 Sam James
2021-11-05  7:01 Sam James
2021-10-20 16:43 Andreas Sturmlechner
2021-10-20 16:43 Andreas Sturmlechner
2021-09-22 20:01 Andreas Sturmlechner
2021-09-19  4:11 Sam James
2021-09-18 22:07 Sam James
2021-09-15  7:29 Andreas Sturmlechner
2021-09-15  6:36 Agostino Sarubbo
2021-09-13  9:32 Andreas Sturmlechner
2021-09-02 18:38 Andreas Sturmlechner
2021-08-26 12:05 Andreas Sturmlechner
2021-07-22  6:07 Sam James
2021-07-18  0:33 Sam James
2021-07-17  7:44 Agostino Sarubbo
2021-07-04 20:40 Andreas Sturmlechner
2021-07-02 18:53 Andreas Sturmlechner
2021-07-02 18:53 Andreas Sturmlechner
2021-06-01 10:48 Sam James
2021-06-01  9:00 Sam James
2021-06-01  9:00 Sam James
2021-05-20 20:55 Georgy Yakovlev
2021-05-17 21:15 Andreas Sturmlechner
2021-05-03  6:29 Andreas Sturmlechner
2021-04-24 21:11 Andreas Sturmlechner
2021-04-24 21:11 Andreas Sturmlechner
2021-03-12 20:08 Andreas Sturmlechner
2021-03-07 19:44 Sam James
2021-03-06 18:37 Sam James
2021-03-06 15:11 Thomas Deutschmann
2021-02-26 21:23 Andreas Sturmlechner
2021-02-08 19:38 Georgy Yakovlev
2021-02-07 17:54 Andreas Sturmlechner
2021-02-07 13:42 Andreas Sturmlechner
2021-02-07 13:42 Andreas Sturmlechner
2021-02-05 22:30 Andreas Sturmlechner
2021-01-10  9:06 Sam James
2021-01-09 21:16 Sam James
2021-01-09 15:15 Sam James
2020-11-27 21:50 Georgy Yakovlev
2020-11-27 21:50 Georgy Yakovlev
2020-10-18 14:45 Thomas Deutschmann
2020-10-12 15:22 Sam James
2020-10-12 11:45 Sam James
2020-10-10 19:27 Andreas Sturmlechner
2020-09-13 13:40 Thomas Deutschmann
2020-05-27 23:20 Georgy Yakovlev
2020-05-27 23:20 Georgy Yakovlev
2020-05-20 13:32 Mikle Kolyada
2020-05-20  9:50 Mikle Kolyada
2020-05-19 19:32 Mikle Kolyada
2020-04-29 18:09 Andreas Sturmlechner
2020-03-28 10:03 Mart Raudsepp
2020-03-19 13:15 Agostino Sarubbo
2020-03-19 12:46 Agostino Sarubbo
2020-02-10  6:52 Andreas Sturmlechner
2020-02-08 13:25 Mikle Kolyada
2020-01-15 22:02 Andreas Sturmlechner
2020-01-12  9:41 Andreas Sturmlechner
2019-12-22 16:29 Aaron Bauman
2019-12-18 11:23 Agostino Sarubbo
2019-11-12 15:01 Aaron Bauman
2019-10-20 16:10 Mikle Kolyada
2019-05-24 20:48 Aaron Bauman
2019-05-23 13:20 Mikle Kolyada
2019-05-21 20:50 Mikle Kolyada
2019-05-21 15:03 Mikle Kolyada
2019-04-26 17:51 Anthony G. Basile
2019-04-25  2:32 Michael Palimaka
2019-04-24 20:15 Andreas Sturmlechner
2019-02-10 23:46 Andreas Sturmlechner
2019-01-09 10:40 Mikle Kolyada
2019-01-09 10:32 Mikle Kolyada
2018-11-13 11:32 Andreas Sturmlechner
2018-10-24 18:06 Andreas Sturmlechner
2018-10-19  7:53 Andreas Sturmlechner
2018-10-17 22:21 Thomas Deutschmann
2018-10-16 16:09 Mikle Kolyada
2018-09-13 17:28 Andreas Sturmlechner
2018-07-15 16:13 Andreas Sturmlechner
2018-07-15 14:23 Thomas Deutschmann
2018-07-13 13:41 Mikle Kolyada
2018-07-12 10:38 Andreas Sturmlechner
2018-07-12 10:38 Andreas Sturmlechner
2018-06-27 19:00 Andreas Sturmlechner
2018-06-27 19:00 Andreas Sturmlechner
2018-06-27 19:00 Andreas Sturmlechner
2018-06-23 17:04 Andreas Sturmlechner
2018-06-23 17:04 Andreas Sturmlechner
2018-05-25 19:12 Aaron Bauman
2018-01-31  0:46 Andreas Sturmlechner
2018-01-15 11:08 Michael Palimaka
2017-12-23  0:45 Michael Palimaka
2017-12-10 12:15 Michael Palimaka
2017-11-28 10:49 Michael Palimaka
2017-10-10 12:32 Michael Palimaka
2017-08-31 15:45 Chí-Thanh Christopher Nguyễn
2017-07-30 14:30 David Seifert
2017-07-04 15:49 Agostino Sarubbo
2017-07-04 14:02 Agostino Sarubbo
2017-06-25 15:11 Alexis Ballier
2017-06-24  2:29 Michael Palimaka
2017-06-05 12:44 Michael Palimaka
2017-06-03 15:53 Michael Palimaka
2016-12-15  5:18 Davide Pesavento
2016-12-06  6:54 Michael Palimaka
2016-08-31 18:24 Michael Palimaka
2016-05-08  1:08 Davide Pesavento

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=1641330478.2b134e09a3ab94f3c33419cf0b8114d004cec477.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