rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 122243 from mozilla:Factory

Browse Source 
fix ARM build (reportedly)

OBS-URL: https://build.opensuse.org/request/show/122243
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=150
This commit is contained in:
Stephan Kulow 2012-05-26 07:27:11 +00:00 committed by Git OBS Bridge
commit f05b764554
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MozillaFirefox.changes
View File

@ -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

2
MozillaFirefox.spec
View File

@ -94,6 +94,7 @@ Patch15: mozilla-yarr-pcre.patch
Patch16: mozilla-revert_621446.patch
Patch17: mozilla-libnotify.patch
Patch18: mozilla-gcc47.patch
Patch19: mozilla-arm-disable-edsp.patch
# Firefox/browser
Patch31: firefox-browser-css.patch
Patch32: firefox-cross-desktop.patch
@ -226,6 +227,7 @@ cd $RPM_BUILD_DIR/mozilla
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
#
%patch31 -p1
%patch32 -p1

27
mozilla-arm-disable-edsp.patch Normal file
View File

@ -0,0 +1,27 @@
# HG changeset patch
# User Adrian Schröter <adrian@suse.de>
# Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f
disable ESDP support (no BNC or BMO reference yet :-()
diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h
--- a/xpcom/glue/arm.h
+++ b/xpcom/glue/arm.h
@@ -143,17 +143,17 @@ namespace mozilla {
extern bool NS_COM_GLUE neon_enabled;
#endif
#endif
}
#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
inline bool supports_edsp() { return false; }
#endif
#if defined(MOZILLA_PRESUME_ARMV6)
# define MOZILLA_MAY_SUPPORT_ARMV6 1