From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F54015ACFC for ; Mon, 1 May 2023 17:49:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95211E07F1; Mon, 1 May 2023 17:49:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 752ECE07F1 for ; Mon, 1 May 2023 17:49:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88F83341541 for ; Mon, 1 May 2023 17:49:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21E45A40 for ; Mon, 1 May 2023 17:49:48 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1682963384.14bb75bbae34f7671c7dd622f7130d7580d0a226.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-112.0.2.ebuild www-client/firefox/metadata.xml X-VCS-Directories: www-client/firefox/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 14bb75bbae34f7671c7dd622f7130d7580d0a226 X-VCS-Branch: master Date: Mon, 1 May 2023 17:49:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 640f9b1a-d1a6-474e-b514-19587a45615c X-Archives-Hash: 4755476764abf104791db30af185c3f5 commit: 14bb75bbae34f7671c7dd622f7130d7580d0a226 Author: Joonas Niilola gentoo org> AuthorDate: Mon May 1 17:42:59 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon May 1 17:49:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bb75bb www-client/firefox: enable 'jumbo-build' for unified files - "jumbo-build" allows adjusting resource-usage on weaker hardware, e.g. x86 & arm. "Jumbo-build" has been default-enabled and should only be disabled to control resource usage, or if a build error happens. - making it possible to adjust FILES_PER_UNIFIED_FILE but going above the defaults always crashed the build for me. Bug: https://bugs.gentoo.org/905431 Bug: https://bugs.gentoo.org/905262 Signed-off-by: Joonas Niilola gentoo.org> www-client/firefox/firefox-112.0.2.ebuild | 20 +++++++++++++++++++- www-client/firefox/metadata.xml | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/www-client/firefox/firefox-112.0.2.ebuild b/www-client/firefox/firefox-112.0.2.ebuild index b7c280646a74..9b8d6211fc3a 100644 --- a/www-client/firefox/firefox-112.0.2.ebuild +++ b/www-client/firefox/firefox-112.0.2.ebuild @@ -63,7 +63,7 @@ SLOT="rapid" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" -IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux" +IUSE+=" jack +jumbo-build libproxy lto +openh264 pgo pulseaudio sndio selinux" IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp" IUSE+=" +telemetry wayland wifi +X" @@ -664,8 +664,24 @@ src_prepare() { || die "sed failed to disable ccache stats call" einfo "Removing pre-built binaries ..." + find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die + # Respect choice for "jumbo-build" + # Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431 + if use jumbo-build; then + local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16} + elog "" + elog "jumbo-build enabled with ${my_files_per_unified_file}." + elog "if you get a build failure, try -jumbo-build before opening a bug report." + elog "" + + sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" python/mozbuild/mozbuild/frontend/data.py || + die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py" + sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" js/src/moz.build || + die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build" + fi + # Create build dir BUILD_DIR="${WORKDIR}/${PN}_build" mkdir -p "${BUILD_DIR}" || die @@ -873,6 +889,8 @@ src_configure() { mozconfig_use_enable wifi necko-wifi + ! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build + if use X && use wayland ; then mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland elif ! use X && use wayland ; then diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml index f1207e1b8b77..4da06e8a17fe 100644 --- a/www-client/firefox/metadata.xml +++ b/www-client/firefox/metadata.xml @@ -12,6 +12,7 @@ Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles Force-enable hardware-accelerated rendering (Mozilla bug 594876) + Enable unified build - combines source files to speed up build process, but requires more memory Enable libproxy support Enable Link Time Optimization (LTO) Use media-libs/openh264 for H264 support