diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/firefox | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'package/firefox')
| -rw-r--r-- | package/firefox/Makefile | 4 | ||||
| -rw-r--r-- | package/firefox/patches/patch-xpcom_ds_nsMathUtils_h | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 2d37ef8ac..0682bc824 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -19,8 +19,9 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_ PKG_NOPARALLEL:= 1 PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= x86 x86_64 mips native +PKG_ARCH_DEPENDS:= x86 x86_64 native PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin +PKG_SYSTEM_DEPENDS:= ibm-x40 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-release @@ -78,6 +79,7 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-mathml \ --disable-jemalloc \ --disable-crashreporter \ + --disable-libjpeg-turbo \ --disable-elf-hack XAKE_FLAGS+= OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h new file mode 100644 index 000000000..7c5b42fb6 --- /dev/null +++ b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h @@ -0,0 +1,11 @@ +--- mozilla-release.orig/xpcom/ds/nsMathUtils.h 2011-07-08 03:15:44.000000000 +0200 ++++ mozilla-release/xpcom/ds/nsMathUtils.h 2011-08-01 14:40:58.343424403 +0200 +@@ -170,7 +170,7 @@ inline NS_HIDDEN_(bool) NS_finite(double + // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. + return !!_finite(d); + #else +- return finite(d); ++ return isfinite(d); + #endif + } + |