From f6f6df084e7a3757155efb4aa45a7a33213b0fb2c3f8e320749ea1b7a9dad675 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Mon, 26 Nov 2018 10:42:10 +0000
Subject: [PATCH] Accepting request 651976 from
 home:Guillaume_G:branches:mozilla:Factory2

- Clean-up %arm build

OBS-URL: https://build.opensuse.org/request/show/651976
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=695
---
 MozillaFirefox.changes |  5 +++++
 MozillaFirefox.spec    | 16 +---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 35d82632..85630c69 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 26 09:46:02 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Clean-up %arm build
+
 -------------------------------------------------------------------
 Sun Nov 18 11:01:21 UTC 2018 - manfred.h@gmx.net
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index fef7943e..4f45a6e2 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -306,9 +306,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 %if 0%{?suse_version} > 1320
 export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
 %endif
-%ifarch %arm
-export CFLAGS="${CFLAGS/-g / }"
-%endif
 %ifarch %arm %ix86
 # Limit RAM usage during link
 export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
@@ -322,9 +319,6 @@ export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now"
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
 export CXXFLAGS="$CFLAGS"
-%ifarch %{arm}
-export RUSTFLAGS="-Cdebuginfo=0"
-%endif
 export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
 %limit_build -m 1500
 cat << EOF > $MOZCONFIG
@@ -348,18 +342,10 @@ ac_add_options --enable-pie
 %if 0%{?suse_version} > 1320
 ac_add_options --enable-optimize="-g -O2"
 %endif
-%ifarch %arm
-%if 0%{?suse_version} > 1230
-ac_add_options --disable-optimize
-%endif
-%endif
 # bmo#1441155 - Disable the generation of Rust debug symbols on Linux32
-%ifarch %ix86
+%ifarch %ix86 %arm
 ac_add_options --disable-debug-symbols
 %endif
-%ifarch %arm
-ac_add_options --disable-elf-hack
-%endif
 %if 0%{?suse_version} > 1549
 ac_add_options --disable-elf-hack
 %endif