From 2ed4264a2dd197f08141210e758477f3d7a214e2 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Mar 29 2017 11:13:08 +0000
Subject: Skia support disabled on ARM/ix86 builds (failed for memory exhausted)


---

diff --git a/icecat.spec b/icecat.spec
index 0caa4f0..e9688ee 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -69,12 +69,9 @@
 %bcond_without pulseaudio
 #
 
-## /usr/bin/ld: final link failed: Memory exhausted
-ExcludeArch: %{arm}
-
 Name:    icecat
 Version: 52.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: GNU version of Firefox browser
 Group:   Applications/Internet
 
@@ -380,7 +377,7 @@ echo "ac_add_options --with-system-jpeg" >> .mozconfig
 echo "ac_add_options --disable-crashreporter" >> .mozconfig
 echo "ac_add_options --disable-eme" >> .mozconfig
 
-%ifarch aarch64 ppc64 s390x
+%ifarch aarch64 ppc64 s390x %{arm} %{ix86}
 echo "ac_add_options --disable-skia" >> .mozconfig
 %endif
 
@@ -396,7 +393,7 @@ echo "ac_add_options --enable-dtrace" >> .mozconfig
 %define optimize_flags "-g -O2"
 %endif
 %endif
-%ifarch %{arm}
+%ifarch %{arm} s390 s390x
 # ARMv7 need that (rhbz#1426850)
 %define optimize_flags "-g -O2 -fno-schedule-insns"
 %endif
@@ -467,14 +464,14 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 %if %{?debug_build}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
 %endif
-%ifarch s390
-MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
+%ifarch s390 s390x %{arm}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/')
 # If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
 # overrides the -g1 from line above and breaks building on s390
 # (OOM when linking, rhbz#1238225)
 export MOZ_DEBUG_FLAGS=" "
 %endif
-%ifarch s390 %{arm} ppc aarch64
+%ifarch s390 s390x %{arm} %{power64} aarch64 %{arm}
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 export CFLAGS=$MOZ_OPT_FLAGS
@@ -489,7 +486,7 @@ export PYTHON='%{__python2}'
 MOZ_SMP_FLAGS=-j1
 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
-%ifarch %{ix86} x86_64 %{power64} aarch64
+%ifarch x86_64 %{power64} aarch64
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
@@ -751,8 +748,12 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda
 %exclude %{_includedir}/%{icecat_ver}/
 
 %changelog
+* Sun Mar 26 2017 Antonio Trande <sagitterATfedoraproject.org> 52.0.1-5
+- Skia support disabled on ARM/ix86 builds (failed for memory exhausted)
+
 * Sun Mar 26 2017 Antonio Trande <sagitterATfedoraproject.org> 52.0.1-4
-- Disable ARM builds (failed for memory exhausted)
+- Downgrade optimization level on ARM builds (failed for memory exhausted)
+- Use one job with Make on ix86
 
 * Wed Mar 22 2017 Antonio Trande <sagitterATfedoraproject.org> 52.0.1-3
 - Added fix for mozbz#1158076