From fb09d0bcd0539298993f00807121a3d67c84487e Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 13 Dec 2018 11:45:27 +0100
Subject: Enable arm

---
 firefox.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'firefox.spec')

diff --git a/firefox.spec b/firefox.spec
index ea49c1e..1f6969d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,6 +1,3 @@
-# Temporary disable arm due to build failures
-ExcludeArch: armv7hl
-
 %global system_nss        1
 %global system_ffi        1
 %global system_libvpx     1
@@ -80,7 +77,7 @@ Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        64.0
 
-Release:        4%{?pre_tag}%{?dist}
+Release:        5%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -498,9 +495,13 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
 export MOZ_DEBUG_FLAGS=" "
 %endif
 %if !0%{?build_with_clang}
-%ifarch s390 %{arm} ppc aarch64 %{ix86}
+%ifarch s390 ppc aarch64 %{ix86}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
+%ifarch %{arm}
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory"
+echo "ac_add_options --enable-linker=gold" >> .mozconfig
+%endif
 %endif
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"
@@ -886,6 +887,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Dec 13 2018 Martin Stransky <stransky@redhat.com> - 64.0-5
+- Enable arm.
+
 * Wed Dec 12 2018 Martin Stransky <stransky@redhat.com> - 64.0-4
 - Use gcc on all platforms for official release.
 
-- 
cgit