diff options
Diffstat (limited to 'www-client/chromium/chromium-64.0.3282.24.ebuild')
| -rw-r--r-- | www-client/chromium/chromium-64.0.3282.24.ebuild | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/www-client/chromium/chromium-64.0.3282.24.ebuild b/www-client/chromium/chromium-64.0.3282.24.ebuild index 766965c04765..299b79320806 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 multiprocessing 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 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,24 +164,16 @@ pre_build_checks() { fi # Check build requirements, bug #541816 and bug #471810 . - local reqmem=3 + CHECKREQS_MEMORY="3G" 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 - reqmem=16 + CHECKREQS_MEMORY="16G" 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 } @@ -448,6 +440,9 @@ src_configure() { # Trying to use gold results in linker crash. myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" + # Disable forced lld, bug 641556 + myconf_gn+=" use_lld=false" + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" |