Accepting request 952269 from home:dirkmueller:Factory

- remove memoryperjob and use %limit instead. this allows to
  adapt to more worker types, and lowers the time the package
  is stuck in "scheduling". raising memory above 8 to lower
  risk for LTO jobs to run OOM
- add hack to disable -Wl,--gc-section which avoids a binutils
  segfault on x86
- change mozilla-reduce-rust-debuginfo.patch: use -g1 everywhere

OBS-URL: https://build.opensuse.org/request/show/952269
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=957
This commit is contained in:
Wolfgang Rosenauer 2022-02-08 08:38:01 +00:00 committed by Git OBS Bridge
parent 9162c87eb4
commit 2764c59751
4 changed files with 36 additions and 32 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Feb 7 22:21:29 UTC 2022 - Dirk Müller <dmueller@suse.com>
- remove memoryperjob and use %limit instead. this allows to
adapt to more worker types, and lowers the time the package
is stuck in "scheduling". raising memory above 8 to lower
risk for LTO jobs to run OOM
- add hack to disable -Wl,--gc-section which avoids a binutils
segfault on x86
- change mozilla-reduce-rust-debuginfo.patch: use -g1 everywhere
-------------------------------------------------------------------
Sun Jan 30 23:58:34 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -381,6 +381,8 @@ export CFLAGS="$CFLAGS -fimplicit-constexpr"
%ifarch %arm %ix86
# Limit RAM usage during link
export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
# A lie to prevent -Wl,--gc-sections being set which requires more memory than 32bit can offer
export GC_SECTIONS_BREAKS_DEBUG_RANGES=yes
%endif
export LDFLAGS="${LDFLAGS} -fPIC -Wl,-z,relro,-z,now"
%ifarch ppc64 ppc64le
@ -408,9 +410,7 @@ echo "export MOZ_TELEMETRY_REPORTING=1"
echo ""
cat << EOF
%else
%ifarch aarch64 ppc64 ppc64le x86_64
%limit_build -m 2048
%endif
%limit_build -m 2560
cat << EOF > $MOZCONFIG
%endif
mk_add_options MOZILLA_OFFICIAL=1
@ -433,8 +433,8 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
ac_add_options --disable-debug-symbols
%else
ac_add_options --enable-debug-symbols=-g1
ac_add_options --disable-install-strip
%endif
ac_add_options --disable-install-strip
# building with elf-hack started to fail everywhere with FF73
#%if 0%{?suse_version} > 1549
%ifnarch aarch64 ppc64 ppc64le s390x

View File

@ -3,14 +3,11 @@
<hardware>
<jobs>4</jobs>
<disk>
<size unit="G">24</size>
<size unit="G">26</size>
</disk>
<physicalmemory>
<size unit="G">8</size>
<size unit="G">15</size>
</physicalmemory>
<memoryperjob>
<size unit="M">1536</size>
</memoryperjob>
</hardware>
<overwrite>
<conditions>
@ -26,4 +23,17 @@
</physicalmemory>
</hardware>
</overwrite>
<!-- LTO disabled - less RAM -->
<overwrite>
<conditions>
<arch>aarch64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
</conditions>
<hardware>
<physicalmemory>
<size unit="G">8</size>
</physicalmemory>
</hardware>
</overwrite>
</constraints>

View File

@ -1,28 +1,11 @@
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -610,6 +610,7 @@ set_config("CARGO_PROFILE_DEV_OPT_LEVEL"
"--enable-frame-pointers",
path_remapping,
path_remappings,
+ host
)
def rust_compile_flags(
opt_level,
@@ -619,6 +620,7 @@ def rust_compile_flags(
frame_pointers,
path_remapping,
path_remappings,
+ host
):
# Cargo currently supports only two interesting profiles for building:
# development and release. Those map (roughly) to --enable-debug and
@@ -642,6 +644,8 @@ def rust_compile_flags(
--- firefox-96.0.3.orig/build/moz.configure/rust.configure
+++ firefox-96.0.3/build/moz.configure/rust.configure
@@ -641,7 +643,7 @@ def rust_compile_flags(
debug_assertions = False
if debug_symbols:
debug_info = "2"
+ if host.bitness == 32 or host.cpu == 'aarch64' or host.cpu == 'ppc64' or host.cpu == 's390x':
+ debug_info = '1'
- debug_info = "2"
+ debug_info = '1'
opts = []