Accepting request 122016 from openSUSE:Factory:ARM

explicit disable EDSP on arm, support is broken

OBS-URL: https://build.opensuse.org/request/show/122016
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=277

MozillaFirefox.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 23 14:40:16 UTC 2012 - adrian@suse.de
+
+- fix build on arm
+
 -------------------------------------------------------------------
 Wed May 16 05:34:01 UTC 2012 - wr@rosenauer.org
 

MozillaFirefox.spec

@@ -102,6 +102,8 @@ Patch34:        firefox-kde-114.patch
 Patch38:        firefox-no-default-ualocale.patch
 Patch39:        firefox-multilocale-chrome.patch
 Patch41:        firefox-branded-icons.patch
+# compile fix in arm header file
+Patch42:        fix-arm-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -238,6 +240,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch38 -p1
 %patch39 -p1
 %patch41 -p1
+%patch42 -p1
 
 %build
 # no need to add build time to binaries

fix-arm-build.patch

@@ -0,0 +1,11 @@
+--- mozilla/xpcom/glue/arm.h
++++ mozilla/xpcom/glue/arm.h	2012-05-23 16:36:32.042201721 +0200
+@@ -148,7 +148,7 @@
+ #if defined(MOZILLA_PRESUME_EDSP)
+ #  define MOZILLA_MAY_SUPPORT_EDSP 1
+   inline bool supports_edsp() { return true; }
+-#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \
++#elif 0 \
+    && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
+   inline bool supports_edsp() { return arm_private::edsp_enabled; }
+ #else