diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch deleted file mode 100644 index e85cbce3658..00000000000 --- a/srcpkgs/firefox/patches/lto-thin.patch +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $ - -use lto=thin to reduce memory pressure when building gkrust -https://bugzilla.mozilla.org/show_bug.cgi?id=1644409 -https://bugzilla.mozilla.org/show_bug.cgi?id=1640982 - -Index: config/makefiles/rust.mk ---- a/config/makefiles/rust.mk.orig -+++ a/config/makefiles/rust.mk -@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST - # gkrust_gtest. And not when doing cross-language LTO. - ifndef MOZ_LTO_RUST_CROSS - ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) --cargo_rustc_flags += -Clto -+cargo_rustc_flags += -Clto=thin -+export CARGO_PROFILE_RELEASE_LTO=thin - endif - # We need -Cembed-bitcode=yes for all crates when using -Clto. - RUSTFLAGS += -Cembed-bitcode=yes diff --git a/srcpkgs/firefox/patches/rust-lto-thin.patch b/srcpkgs/firefox/patches/rust-lto-thin.patch new file mode 100644 index 00000000000..788fceab39f --- /dev/null +++ b/srcpkgs/firefox/patches/rust-lto-thin.patch @@ -0,0 +1,12 @@ +set rust crate lto to thin to not use fatlto for gkrust which fails sometimes +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -92,7 +92,7 @@ + # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. + ifndef MOZ_CODE_COVERAGE + ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) +-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) ++cargo_rustc_flags += -Clto=thin + endif + # We need -Cembed-bitcode=yes for all crates when using -Clto. + RUSTFLAGS += -Cembed-bitcode=yes diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 3bf78b03741..083b409f27b 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=114.0 +version=115.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -12,7 +12,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" # distfiles="${MOZILLA_SITE}/firefox/candidates/${version/beta/b}-candidates/build1/source/firefox-${version/beta/b}.source.tar.xz" distfiles="${MOZILLA_SITE}/firefox/releases/${version}/source/firefox-${version}.source.tar.xz" -checksum=d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6 +checksum=7cdb23fe5ccb54334c8fe14c1e5dd89d5788f8e7b79a2bd9cc4eabdc7e54e898 lib32disabled=yes