From ab979e2eb7382908f46ac8363634949a01a8271d95e1079882c20daf8310690e Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Tue, 4 Nov 2014 23:02:38 +0000
Subject: [PATCH 1/2] Accepting request 259483 from devel:ARM:Factory

- use proper macros for ARM

- use '--disable-optimize' not only on 32-bit x86, but on 32-bit arm too
  to fix compiling.
- pass '-Wl,--no-keep-memory' to linker to reduce required memory during
  linking on arm.

OBS-URL: https://build.opensuse.org/request/show/259483
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=410
---
 MozillaFirefox.changes | 13 +++++++++++++
 MozillaFirefox.spec    |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index fdc4493..ea08b70 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Nov  3 11:36:04 UTC 2014 - dmueller@suse.com
+
+- use proper macros for ARM 
+
+-------------------------------------------------------------------
+Mon Nov  3 11:26:23 UTC 2014 - josua.mayer97@gmail.com
+
+- use '--disable-optimize' not only on 32-bit x86, but on 32-bit arm too
+  to fix compiling.
+- pass '-Wl,--no-keep-memory' to linker to reduce required memory during
+  linking on arm.
+
 -------------------------------------------------------------------
 Thu Oct 30 11:31:05 UTC 2014 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 923c415..9a7d036 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -300,6 +300,7 @@ export CFLAGS="${CFLAGS} -Os"
 %endif
 %ifarch %arm
 export CFLAGS="${CFLAGS/-g / }"
+export LDFLAGS="-Wl,--no-keep-memory"
 %endif
 %ifarch ppc64 ppc64le
 export CFLAGS="$CFLAGS -mminimal-toc"
@@ -319,7 +320,7 @@ ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
 ac_add_options --enable-stdcxx-compat
-%ifarch %ix86
+%ifarch %ix86 %arm
 %if 0%{?suse_version} > 1230
 ac_add_options --disable-optimize
 %endif

From 849a660683a0324e756234581a9f436614629f847dbea0054cc3fd23fb5ff473 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Thu, 6 Nov 2014 20:54:53 +0000
Subject: [PATCH 2/2] Accepting request 259749 from
 home:Guillaume_G:branches:mozilla:Factory

- Disable elf-hack for aarch64
- Enable EGL for aarch64
- Limit RAM usage during link for %arm
- Fix _constraints for ARM

OBS-URL: https://build.opensuse.org/request/show/259749
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=411
---
 MozillaFirefox.changes | 8 ++++++++
 MozillaFirefox.spec    | 7 ++++---
 _constraints           | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index ea08b70..10af83a 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov  4 18:00:35 UTC 2014 - guillaume@opensuse.org
+
+- Disable elf-hack for aarch64
+- Enable EGL for aarch64
+- Limit RAM usage during link for %arm
+- Fix _constraints for ARM
+
 -------------------------------------------------------------------
 Mon Nov  3 11:36:04 UTC 2014 - dmueller@suse.com
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 9a7d036..31d3182 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -300,7 +300,8 @@ export CFLAGS="${CFLAGS} -Os"
 %endif
 %ifarch %arm
 export CFLAGS="${CFLAGS/-g / }"
-export LDFLAGS="-Wl,--no-keep-memory"
+# Limit RAM usage during link
+export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 %ifarch ppc64 ppc64le
 export CFLAGS="$CFLAGS -mminimal-toc"
@@ -325,7 +326,7 @@ ac_add_options --enable-stdcxx-compat
 ac_add_options --disable-optimize
 %endif
 %endif
-%ifnarch ppc ppc64 ppc64le
+%ifnarch ppc ppc64 ppc64le aarch64
 ac_add_options --enable-elf-hack
 %endif
 ac_add_options --with-system-nspr
@@ -370,7 +371,7 @@ ac_add_options --disable-neon
 ac_add_options --disable-webrtc
 %endif
 # try to use OpenGL-ES on ARM
-%ifarch %arm
+%ifarch %arm aarch64
 ac_add_options --with-gl-provider=EGL
 %endif
 EOF
diff --git a/_constraints b/_constraints
index d97e39d..df0fca5 100644
--- a/_constraints
+++ b/_constraints
@@ -15,7 +15,7 @@
     </conditions>
     <hardware>
       <memory>
-        <size unit="M">768</size>
+        <size unit="M">2600</size>
       </memory>
     </hardware>
   </overwrite>