From f2a1d1c9f4d6452a094ba82f8b6612fbf685034610162d1ad38fe381cb37ef2c Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Thu, 13 Dec 2018 12:15:35 +0000
Subject: [PATCH] Accepting request 657818 from
 home:Guillaume_G:branches:mozilla:Factory

- Switch aarch64 builds back to gcc, not clang (bmo#1513605)
- Switch %arm builds back to gcc, not clang to avoid OOM
- Fix build flags when clang is not used
- Fix flags for clang ppc64 builds

OBS-URL: https://build.opensuse.org/request/show/657818
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=700
---
 MozillaFirefox.changes |  8 ++++++++
 MozillaFirefox.spec    | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 31ad3c8..b3c34b1 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec 12 17:33:29 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Switch aarch64 builds back to gcc, not clang (bmo#1513605)
+- Switch %arm builds back to gcc, not clang to avoid OOM
+- Fix build flags when clang is not used
+- Fix flags for clang ppc64 builds
+
 -------------------------------------------------------------------
 Tue Dec 11 08:45:56 UTC 2018 - Wolfgang Rosenauer <wr@rosenauer.org>
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 14df649..e4b118c 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -31,9 +31,16 @@
 %if 0%{?suse_version} > 1320
 %define clang_build 1
 %endif
+# Except on aarch64 due to bmo#1513605
+# and on %%arm due to large ld memory requirements
+%ifarch %arm aarch64
+%define clang_build 0
+%endif
 
 # PIE, full relro (x86_64 for now)
+%ifnarch %arm aarch64
 %define build_hardened 1
+%endif
 
 # Firefox only supports i686
 %ifarch %ix86
@@ -303,6 +310,11 @@ export BUILD_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 %if 0%{?suse_version} <= 1320
 export CC=gcc-7
+%else
+%if 0%{?clang_build} == 0
+export CC=gcc
+export CXX=g++
+%endif
 %endif
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 # boo#986541: add -fno-delete-null-pointer-checks for gcc6
@@ -321,8 +333,10 @@ export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now"
 %endif
 %endif
 %ifarch ppc64 ppc64le
+%if 0%{?clang_build} == 0
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
+%endif
 export CXXFLAGS="$CFLAGS"
 export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
 %limit_build -m 1500