From 3a86056012eb1c789907d5dfa62b850fc798fb17ad10e8dd44c471b9e5c7833e Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 11 Aug 2023 14:20:02 +0000 Subject: [PATCH] Accepting request 1103454 from home:adamm:branches:mozilla:Factory - Fix OOM when linking on 32-bit OBS-URL: https://build.opensuse.org/request/show/1103454 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=1095 --- MozillaFirefox.changes | 5 +++++ MozillaFirefox.spec | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index f6df284..f0edb0a 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -4,6 +4,11 @@ Thu Aug 10 16:32:02 UTC 2023 - Andreas Stieger - Mozilla Firefox 116.0.2 * fixes for other platforms +------------------------------------------------------------------- +Wed Aug 9 09:52:36 UTC 2023 - Adam Majer + +- Fix OOM when linking on 32-bit + ------------------------------------------------------------------- Sat Aug 5 17:46:22 UTC 2023 - Andreas Stieger diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 46eb200..3a30956 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -415,11 +415,11 @@ source ./.obsenv.sh cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -%ifarch %ix86 -mk_add_options MOZ_MAKE_FLAGS=-j1 -%else +#%%ifarch %%ix86 +#mk_add_options MOZ_MAKE_FLAGS=-j1 +#%%else mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} -%endif +#%%endif mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj . \$topsrcdir/browser/config/mozconfig ac_add_options --disable-bootstrap @@ -439,12 +439,10 @@ ac_add_options --disable-debug-symbols ac_add_options --enable-debug-symbols=-g0 %endif ac_add_options --disable-install-strip -# building with elf-hack started to fail everywhere with FF73 -#%%if 0%%{?suse_version} > 1549 -%ifarch %arm %ix86 x86_64 -ac_add_options --disable-elf-hack +%ifarch %ix86 %arm +# OOM on 32-bit when ld passed -Wl,-z,pack-relative-relocs +ac_add_options --enable-elf-hack %endif -#%%endif ac_add_options --with-system-nspr ac_add_options --with-system-nss %if 0%{useccache} != 0