From 66229fa6051805b15ffc477e536f88f2eb0855fe932ed1d1459312d1f0aa4ad9 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sun, 3 Feb 2019 06:39:38 +0000 Subject: [PATCH] - rebased patches - remove workaround for build memory consumption on i586; other mitigations meanwhile introduced (mainly parallelity) will be sufficient mozilla-reduce-files-per-UnifiedBindings.patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=712 --- MozillaFirefox.changes | 6 ++- MozillaFirefox.spec | 4 -- ...lla-reduce-files-per-UnifiedBindings.patch | 37 ------------------- 3 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 mozilla-reduce-files-per-UnifiedBindings.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 0d5ece84..acd50a5a 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -28,7 +28,11 @@ Sat Jan 26 22:37:01 UTC 2019 - Wolfgang Rosenauer NSS 3.41 rust/carge 1.30 rust-cbindgen 0.6.7 --rebased patches +- rebased patches +- remove workaround for build memory consumption on i586; other + mitigations meanwhile introduced (mainly parallelity) will be + sufficient + mozilla-reduce-files-per-UnifiedBindings.patch ------------------------------------------------------------------- Tue Jan 15 14:32:03 UTC 2019 - Martin Liška diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index a2e52bec..f1965974 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -159,7 +159,6 @@ Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-kde.patch Patch3: mozilla-ntlm-full-path.patch Patch4: mozilla-openaes-decl.patch -Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch Patch9: mozilla-bmo1463035.patch @@ -267,9 +266,6 @@ cd $RPM_BUILD_DIR/%{source_prefix} %patch2 -p1 %patch3 -p1 %patch4 -p1 -%ifarch %ix86 -%patch6 -p1 -%endif %patch7 -p1 %patch8 -p1 %patch9 -p1 diff --git a/mozilla-reduce-files-per-UnifiedBindings.patch b/mozilla-reduce-files-per-UnifiedBindings.patch deleted file mode 100644 index 9830ef81..00000000 --- a/mozilla-reduce-files-per-UnifiedBindings.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Andreas Stieger -Date: Fri, 26 Feb 2016 16:20:09 +0000 -Subject: For UnifiedBindings*.cpp files, reduce number of files per unified file -Upstream: no - -home/abuild/rpmbuild/BUILD/obj/dom/bindings/UnifiedBindings16.cpp -[ 1589s] UnifiedBindings17.o -[ 1612s] [ 1567.621989] Out of memory: Kill process 19849 (cc1plus) score 170 or sacrifice child -[ 1612s] [ 1567.625099] Killed process 19849 (cc1plus) total-vm:905704kB, anon-rss:102500kB, file-rss:156kB -[ 1616s] {standard input}: Assembler messages: -[ 1616s] {standard input}:316015: Warning: end of file not at end of a line; newline inserted -[ 1635s] {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive -[ 1636s] c++: internal compiler error: Killed (program cc1plus) -[ 1636s] Please submit a full bug report, - -diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py ---- a/python/mozbuild/mozbuild/frontend/data.py -+++ b/python/mozbuild/mozbuild/frontend/data.py -@@ -310,17 +310,17 @@ class WebIDLCollection(ContextDerived): - @property - def unified_source_mapping(self): - # Bindings are compiled in unified mode to speed up compilation and - # to reduce linker memory size. Note that test bindings are separated - # from regular ones so tests bindings aren't shipped. - return list(group_unified_files(self.all_regular_cpp_basenames(), - unified_prefix='UnifiedBindings', - unified_suffix='cpp', -- files_per_unified_file=32)) -+ files_per_unified_file=16)) - - def all_source_files(self): - from mozwebidlcodegen import WebIDLCodegenManager - return (sorted(list(WebIDLCodegenManager.GLOBAL_DEFINE_FILES)) + - sorted(set(p for p, _ in self.unified_source_mapping))) - - - class IPDLCollection(ContextDerived):