commit: 5cac44dbdb91de91c3f464372eebc150d936988a Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja> AuthorDate: Fri Sep 29 10:12:50 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 1 02:54:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cac44db
www-client/chromium: update disk space checks for 117 and 118 Closes: https://bugs.gentoo.org/914420 Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja> Signed-off-by: Sam James <sam <AT> gentoo.org> www-client/chromium/chromium-117.0.5938.132.ebuild | 18 +++++++++++------- www-client/chromium/chromium-118.0.5993.18.ebuild | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/www-client/chromium/chromium-117.0.5938.132.ebuild b/www-client/chromium/chromium-117.0.5938.132.ebuild index 69e228c52930..7d6944c726c9 100644 --- a/www-client/chromium/chromium-117.0.5938.132.ebuild +++ b/www-client/chromium/chromium-117.0.5938.132.ebuild @@ -257,24 +257,28 @@ llvm_check_deps() { } pre_build_checks() { - # Check build requirements, bug #541816 and bug #471810 . + # Check build requirements: bugs #471810, #541816, #914220 + # We're going to start doing maths here on the size of an unpacked source tarball, + # this should make updates easier as chromium continues to balloon in size. + local BASE_DISK=17 + local EXTRA_DISK=1 CHECKREQS_MEMORY="4G" - CHECKREQS_DISK_BUILD="14G" - tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G" + tc-is-cross-compiler && EXTRA_DISK=2 if use lto || use pgo; then CHECKREQS_MEMORY="9G" - CHECKREQS_DISK_BUILD="15G" - tc-is-cross-compiler && CHECKREQS_DISK_BUILD="18G" - use pgo && CHECKREQS_DISK_BUILD="22G" + EXTRA_DISK=2 + tc-is-cross-compiler && EXTRA_DISK=3 + use pgo && EXTRA_DISK=8 fi if is-flagq '-g?(gdb)?([1-9])'; then if use custom-cflags || use component-build; then - CHECKREQS_DISK_BUILD="27G" + EXTRA_DISK=13 fi if ! use component-build; then CHECKREQS_MEMORY="16G" fi fi + CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G" check-reqs_${EBUILD_PHASE_FUNC} } diff --git a/www-client/chromium/chromium-118.0.5993.18.ebuild b/www-client/chromium/chromium-118.0.5993.18.ebuild index 0ec46308d4b0..b37593b62f2d 100644 --- a/www-client/chromium/chromium-118.0.5993.18.ebuild +++ b/www-client/chromium/chromium-118.0.5993.18.ebuild @@ -243,22 +243,25 @@ llvm_check_deps() { } pre_build_checks() { - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="4G" - CHECKREQS_DISK_BUILD="14G" - tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G" + # Check build requirements: bugs #471810, #541816, #914220 + # We're going to start doing maths here on the size of an unpacked source tarball, + # this should make updates easier as chromium continues to balloon in size. + local BASE_DISK=18 + local EXTRA_DISK=1 + local CHECKREQS_MEMORY="4G" + tc-is-cross-compiler && EXTRA_DISK=2 if use lto || use pgo; then CHECKREQS_MEMORY="9G" - CHECKREQS_DISK_BUILD="15G" - tc-is-cross-compiler && CHECKREQS_DISK_BUILD="18G" - use pgo && CHECKREQS_DISK_BUILD="22G" + tc-is-cross-compiler && EXTRA_DISK=4 + use pgo && EXTRA_DISK=8 fi if is-flagq '-g?(gdb)?([1-9])'; then if use custom-cflags; then - CHECKREQS_DISK_BUILD="27G" + EXTRA_DISK=13 fi CHECKREQS_MEMORY="16G" fi + CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G" check-reqs_${EBUILD_PHASE_FUNC} }
