[xulrunner] Added fix from rhbz#796929 - xulrunner doesn't compile on ARM

[Martin Stransky]

commit d13e1f57a107020f2a8ad8a9d8952c1b91796931
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Feb 27 12:31:48 2012 +0100

    Added fix from rhbz#796929 - xulrunner doesn't compile on ARM

 mozilla-724615.patch |   24 ++++++++++++++++++++++++
 xulrunner.spec       |   10 +++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-724615.patch b/mozilla-724615.patch
new file mode 100644
index 0000000..cc78c1b
--- /dev/null
+++ b/mozilla-724615.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# Parent 6292e55419d1730a2e88a56fd30b2440ce0b393a
+# User Raúl Porcel <armin76 at gentoo.org>
+Bug XXXXXX - Fix TARGET_CPU usage on ARM
+
+
+diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
+--- a/xpcom/glue/objs.mk
++++ b/xpcom/glue/objs.mk
+@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS =      \
+   SSE.cpp                        \
+   unused.cpp                     \
+   nsProxyRelease.cpp             \
+   nsTextFormatter.cpp            \
+   GenericFactory.cpp             \
+   FileUtils.cpp                  \
+   $(NULL)
+ 
+-ifeq (arm,$(TARGET_CPU))
++ifneq (,$(filter arm%,$(TARGET_CPU)))
+ XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
+ endif
+ 
+ XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
diff --git a/xulrunner.spec b/xulrunner.spec
index cea743f..abb8931 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -61,7 +61,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        10.0.1
-Release:        3%{?pre_tag}%{?dist}
+Release:        4%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -100,6 +100,7 @@ Patch43:        mozilla-file.patch
 # https://bugzilla.mozilla.org/show_bug.cgi?id=722127
 Patch44:	mozilla-722127.patch
 Patch45:	mozilla-727401.patch
+Patch46:	mozilla-724615.patch
 
 # ---------------------------------------------------
 
@@ -233,6 +234,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch43 -p1 -b .file
 %patch44 -p2 -b .vpx1.0.0
 %patch45 -p1 -b .727401
+%patch46 -p1 -b .724615
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -255,15 +257,18 @@ echo "ac_add_options --disable-jemalloc" >> .mozconfig
 echo "ac_add_options --with-arch=armv7-a" >> .mozconfig
 echo "ac_add_options --with-float-abi=hard" >> .mozconfig
 echo "ac_add_options --with-fpu=vfpv3-d16" >> .mozconfig
+echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 %ifarch armv7hnl
 echo "ac_add_options --with-arch=armv7-a" >> .mozconfig
 echo "ac_add_options --with-float-abi=hard" >> .mozconfig
 echo "ac_add_options --with-fpu=neon" >> .mozconfig
+echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 %ifarch armv5tel
 echo "ac_add_options --with-arch=armv5te" >> .mozconfig
 echo "ac_add_options --with-float-abi=soft" >> .mozconfig
+echo "ac_add_options --disable-elf-hack" >> .mozconfig
 %endif
 
 %ifnarch %{ix86} x86_64
@@ -459,6 +464,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Feb 27 2012 Martin Stransky <stransky at redhat.com> - 10.0.1-4
+- Added fix from rhbz#796929 - xulrunner doesn't compile on ARM
+
 * Tue Feb 16 2012 Martin Stransky <stransky at redhat.com> - 10.0.1-3
 - Added fix for mozbz#727401