summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-12 11:50:53 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-12 11:50:53 +0200
commit21d272edadf566845647f72e39fcd7d3ad34c29c (patch)
tree9a4fff35163c592f44dd4a7588ae158bbf035cfa /package
parent4fdfeb1433cc2fedf620cb2aa1678dbad535488c (diff)
fix cross-compile for mips64
Diffstat (limited to 'package')
-rw-r--r--package/firefox/Makefile7
-rw-r--r--package/firefox/patches/patch-content_media_nsAudioStream_cpp11
2 files changed, 16 insertions, 2 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 0009c48e2..73a2afb7b 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -20,7 +20,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
WRKDIST= ${WRKDIR}/mozilla-1.9.2
-PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40
+PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote
include $(TOPDIR)/mk/package.mk
@@ -28,7 +28,8 @@ $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${P
CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \
- HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2"
+ HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \
+ ac_cv_thread_keyword=no
CONFIGURE_ARGS+= --enable-application=browser \
--with-system-zlib \
--with-system-jpeg \
@@ -41,6 +42,8 @@ CONFIGURE_ARGS+= --enable-application=browser \
--disable-gnomevfs \
--disable-optimize \
--disable-necko-wifi \
+ --disable-svg \
+ --disable-mathml \
--disable-crashreporter
post-install:
diff --git a/package/firefox/patches/patch-content_media_nsAudioStream_cpp b/package/firefox/patches/patch-content_media_nsAudioStream_cpp
new file mode 100644
index 000000000..1452b9b6b
--- /dev/null
+++ b/package/firefox/patches/patch-content_media_nsAudioStream_cpp
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/content/media/nsAudioStream.cpp 2010-04-02 18:02:19.000000000 +0200
++++ mozilla-1.9.2/content/media/nsAudioStream.cpp 2010-06-11 21:28:33.522214080 +0200
+@@ -246,7 +246,7 @@ float nsAudioStream::GetPosition()
+ #if defined(XP_WIN)
+ positionType = SA_POSITION_WRITE_HARDWARE;
+ #endif
+- PRInt64 position = 0;
++ int64_t position = 0;
+ if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
+ positionType, &position) == SA_SUCCESS) {
+ return (position / float(mRate) / mChannels / sizeof(short));