summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-07 13:46:17 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-07 13:46:17 +0100
commit8cc6444e13a2670407eedee0d417cee6b3ce03e8 (patch)
treed6dfc2315e64a641377f658c94bdde6f22c50580
parent8b3dac771af71587d791d7a8171c2b4036afea10 (diff)
fix firefox on lemote yeelong, with Os/O2 getting illegal instruction for the html5 video on the start site. fix some problems when compiling mozilla with debug on
-rw-r--r--package/firefox/Makefile6
-rw-r--r--package/firefox/patches/patch-js_src_assembler_wtf_Platform_h12
-rw-r--r--package/firefox/patches/patch-js_src_yarr_BumpPointerAllocator_h11
3 files changed, 28 insertions, 1 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 9a9fc399c..3a21a2d80 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -15,7 +15,7 @@ PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf li
PKG_DEPENDS+= harfbuzz mesalib libvpx libbz2 ca-certificates libevent
PKG_BUILDDEP:= alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
-PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent
+PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent python2-host
PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
PKG_NOPARALLEL:= 1
@@ -104,6 +104,10 @@ CONFIGURE_ARGS+= --enable-application=browser \
--disable-safe-browsing \
--disable-elf-hack
+ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+TARGET_CFLAGS:= $(subst Os,g3,$(TARGET_CFLAGS))
+endif
+
XAKE_FLAGS+= OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
diff --git a/package/firefox/patches/patch-js_src_assembler_wtf_Platform_h b/package/firefox/patches/patch-js_src_assembler_wtf_Platform_h
new file mode 100644
index 000000000..68a7adf0a
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_assembler_wtf_Platform_h
@@ -0,0 +1,12 @@
+--- mozilla-release.orig/js/src/assembler/wtf/Platform.h 2013-09-11 01:15:04.000000000 +0200
++++ mozilla-release/js/src/assembler/wtf/Platform.h 2013-10-28 12:43:50.000000000 +0100
+@@ -139,8 +139,7 @@
+
+ /* WTF_CPU_MIPS - MIPS 32-bit */
+ /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
+-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
+- && defined(_ABIO32)
++#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_))
+ #define WTF_CPU_MIPS 1
+ #if defined(__MIPSEB__)
+ #define WTF_CPU_BIG_ENDIAN 1
diff --git a/package/firefox/patches/patch-js_src_yarr_BumpPointerAllocator_h b/package/firefox/patches/patch-js_src_yarr_BumpPointerAllocator_h
new file mode 100644
index 000000000..1697dfddd
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_yarr_BumpPointerAllocator_h
@@ -0,0 +1,11 @@
+--- mozilla-release.orig/js/src/yarr/BumpPointerAllocator.h 2013-09-11 01:15:09.000000000 +0200
++++ mozilla-release/js/src/yarr/BumpPointerAllocator.h 2013-10-28 12:44:10.000000000 +0100
+@@ -38,6 +38,8 @@ namespace WTF {
+ #define MINIMUM_BUMP_POOL_SIZE 0x2000
+ #elif WTF_CPU_IA64
+ #define MINIMUM_BUMP_POOL_SIZE 0x4000
++#elif WTF_CPU_MIPS
++#define MINIMUM_BUMP_POOL_SIZE 0x4000
+ #else
+ #define MINIMUM_BUMP_POOL_SIZE 0x1000
+ #endif