commit: 7efa454f0f38f0ec0cc36404faf7a16600e8a0f4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 18:14:57 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 18:15:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efa454f
www-client/chromium: add memory check based on MAKEOPTS
Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35
www-client/chromium/chromium-63.0.3239.108.ebuild | 14 +++++++++++---
www-client/chromium/chromium-64.0.3282.24.ebuild | 14 +++++++++++---
www-client/chromium/chromium-65.0.3294.5.ebuild | 14 +++++++++++---
3 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/www-client/chromium/chromium-63.0.3239.108.ebuild
b/www-client/chromium/chromium-63.0.3239.108.ebuild
index c5e75dfa71e..992afee3e79 100644
--- a/www-client/chromium/chromium-63.0.3239.108.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.108.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et
fa fi fil fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl
sr
sv sw ta te th tr uk vi zh-CN zh-TW"
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib
ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1
toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib
multiprocessing ninja-utils pax-utils portability python-any-r1
readme.gentoo-r1 toolchain-funcs versionator xdg-utils
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/";
@@ -164,16 +164,24 @@ pre_build_checks() {
fi
# Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
+ local reqmem=3
CHECKREQS_DISK_BUILD="5G"
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
CHECKREQS_DISK_BUILD="25G"
if ! use component-build; then
- CHECKREQS_MEMORY="16G"
+ reqmem=16
fi
fi
eshopts_pop
+
+ local jobs=$(makeopts_jobs)
+ if (( jobs > reqmem )); then
+ CHECKREQS_MEMORY="${jobs}G"
+ else
+ CHECKREQS_MEMORY="${reqmem}G"
+ fi
+
check-reqs_pkg_setup
}
diff --git a/www-client/chromium/chromium-64.0.3282.24.ebuild
b/www-client/chromium/chromium-64.0.3282.24.ebuild
index 7737358b339..766965c0476 100644
--- a/www-client/chromium/chromium-64.0.3282.24.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.24.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et
fa fi fil fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl
sr
sv sw ta te th tr uk vi zh-CN zh-TW"
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib
ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1
toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib
multiprocessing ninja-utils pax-utils portability python-any-r1
readme.gentoo-r1 toolchain-funcs versionator xdg-utils
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/";
@@ -164,16 +164,24 @@ pre_build_checks() {
fi
# Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
+ local reqmem=3
CHECKREQS_DISK_BUILD="5G"
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
CHECKREQS_DISK_BUILD="25G"
if ! use component-build; then
- CHECKREQS_MEMORY="16G"
+ reqmem=16
fi
fi
eshopts_pop
+
+ local jobs=$(makeopts_jobs)
+ if (( jobs > reqmem )); then
+ CHECKREQS_MEMORY="${jobs}G"
+ else
+ CHECKREQS_MEMORY="${reqmem}G"
+ fi
+
check-reqs_pkg_setup
}
diff --git a/www-client/chromium/chromium-65.0.3294.5.ebuild
b/www-client/chromium/chromium-65.0.3294.5.ebuild
index cd5fc3c1b0f..5bd06fad551 100644
--- a/www-client/chromium/chromium-65.0.3294.5.ebuild
+++ b/www-client/chromium/chromium-65.0.3294.5.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et
fa fi fil fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl
sr
sv sw ta te th tr uk vi zh-CN zh-TW"
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib
ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1
toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib
multiprocessing ninja-utils pax-utils portability python-any-r1
readme.gentoo-r1 toolchain-funcs versionator xdg-utils
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/";
@@ -164,16 +164,24 @@ pre_build_checks() {
fi
# Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
+ local reqmem=3
CHECKREQS_DISK_BUILD="5G"
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
CHECKREQS_DISK_BUILD="25G"
if ! use component-build; then
- CHECKREQS_MEMORY="16G"
+ reqmem=16
fi
fi
eshopts_pop
+
+ local jobs=$(makeopts_jobs)
+ if (( jobs > reqmem )); then
+ CHECKREQS_MEMORY="${jobs}G"
+ else
+ CHECKREQS_MEMORY="${reqmem}G"
+ fi
+
check-reqs_pkg_setup
}
