From 106ed5cb055547d66c273087d738c6806ecc43f23164b3bab73b7929980319fe Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sat, 27 Mar 2021 14:02:10 +0000
Subject: [PATCH] - Switch to clang_build globally; just on TW/x86_64 it does
 not work   due to unreolved externals `__rust_probestack' - disable
 clang_build   then. - useccache: Add conditionals to enable/disable ccache.

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=902
---
 MozillaFirefox.changes |  8 ++++++++
 MozillaFirefox.spec    | 20 +++++++++++++++++++-
 _constraints           |  2 +-
 l10n-87.0.tar.xz       |  4 ++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 3ba0d18..2cc20b3 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar 27 10:40:46 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
+
+- Switch to clang_build globally; just on TW/x86_64 it does not work
+  due to unreolved externals `__rust_probestack' - disable clang_build
+  then.
+- useccache: Add conditionals to enable/disable ccache.
+
 -------------------------------------------------------------------
 Tue Mar 23 16:42:19 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 1713fcb..51ef77f 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -44,13 +44,23 @@
 %define do_profiling   0
 
 # upstream default is clang (to use gcc for large parts set to 0)
-%define clang_build 0
+%define clang_build    1
+%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
+%ifarch x86_64
+# on Tumbleweed/x86_64 this does not work due to undefined
+#  references to `__rust_probestack'
+%define clang_build    0
+%endif
+%endif
 
 # PIE, full relro
 %define build_hardened 1
 
 %bcond_with only_print_mozconfig
 
+# define if ccache should be used or not
+%define useccache     1
+
 # Firefox only supports i686
 %ifarch %ix86
 ExclusiveArch:  i586 i686
@@ -96,7 +106,9 @@ BuildRequires:  gcc9-c++
 BuildRequires:  gcc-c++
 %endif
 BuildRequires:  cargo >= 1.47
+%if 0%{useccache} != 0
 BuildRequires:  ccache
+%endif
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libidl-devel
@@ -455,7 +467,9 @@ ac_add_options --disable-elf-hack
 #%endif
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
+%if 0%{useccache} != 0
 ac_add_options --with-ccache
+%endif
 %if %{localize}
 ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
 %endif
@@ -505,7 +519,9 @@ ac_add_options MOZ_PGO=1
 %endif
 EOF
 %if !%{with only_print_mozconfig}
+%if 0%{useccache} != 0
 ccache -s
+%endif
 %if 0%{?do_profiling}
 xvfb-run --server-args="-screen 0 1920x1080x24" \
 %endif
@@ -560,8 +576,10 @@ sed -r '/^(ja-JP-mac|ga-IE|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig
 ' -- {}
 %endif
 
+%if 0%{useccache} != 0
 ccache -s
 %endif
+%endif
 
 %install
 cd $RPM_BUILD_DIR/obj
diff --git a/_constraints b/_constraints
index 11cfe8b..9dbacb7 100644
--- a/_constraints
+++ b/_constraints
@@ -5,7 +5,7 @@
       <size unit="G">36</size>
     </disk>
     <memory>
-      <size unit="G">26</size>
+      <size unit="G">8</size>
     </memory>
     <memoryperjob>
       <size unit="M">2000</size>
diff --git a/l10n-87.0.tar.xz b/l10n-87.0.tar.xz
index 4f0b575..f060f6d 100644
--- a/l10n-87.0.tar.xz
+++ b/l10n-87.0.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf18b5dfabd2d34939290bb84ae00cdd37d3e1e1f16f702d8a294340b3443bc8
-size 49956188
+oid sha256:e62d275b344f0972a032c5b6d6aa1522671b08856890d03ae55b569310b8a686
+size 49925540