Patchwork [meta-browser] firefox: fix build on qemux86-64

login
register
mail settings
Submitter Martin Jansa
Date Aug. 15, 2014, 9:46 p.m.
Message ID <1408139168-14007-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/78363/
State Accepted, archived
Headers show

Comments

Martin Jansa - Aug. 15, 2014, 9:46 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-mozilla/firefox/firefox/x86_64-fix.patch | 16 ++++++++++++++++
 recipes-mozilla/firefox/firefox_10.0.11esr.bb    |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 recipes-mozilla/firefox/firefox/x86_64-fix.patch

Patch

diff --git a/recipes-mozilla/firefox/firefox/x86_64-fix.patch b/recipes-mozilla/firefox/firefox/x86_64-fix.patch
new file mode 100644
index 0000000..69bd957
--- /dev/null
+++ b/recipes-mozilla/firefox/firefox/x86_64-fix.patch
@@ -0,0 +1,16 @@ 
+Loosely based on
+https://bug436263.bugzilla.mozilla.org/attachment.cgi?id=323103
+
+--- mozilla-esr10/js/src/jscpucfg.h.orig        2014-08-15 16:02:55.462991201 +0000
++++ mozilla-esr10/js/src/jscpucfg.h     2014-08-15 15:56:10.858551202 +0000
+@@ -42,6 +42,10 @@
+
+ #define JS_HAVE_LONG_LONG
+
++#if defined __GNUC__ && defined __x86_64__
++#define HAVE_VA_LIST_AS_ARRAY
++#endif
++
+ #if defined(_WIN64)
+
+ #if defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
diff --git a/recipes-mozilla/firefox/firefox_10.0.11esr.bb b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
index 307e672..cd303ff 100644
--- a/recipes-mozilla/firefox/firefox_10.0.11esr.bb
+++ b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
@@ -73,7 +73,8 @@  SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/f
            file://debian-hacks/Bug-508942-Use-Preprocessor.py-filters-in-defines-an.patch \
            file://configure.patch \
            file://powerpc_va_list.patch \
-	   file://freetype-2.5.patch \
+           file://freetype-2.5.patch \
+           file://x86_64-fix.patch \
            file://vendor.js"
 
 SRC_URI[archive.md5sum] = "2f0e3a1dd7480e03f374c0121b4155e2"