summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2011-05-16 13:28:35 +0000
committerJory Pratt <anarchy@gentoo.org>2011-05-16 13:28:35 +0000
commit6aa16bada0352fa8377bb78c436924bc34a159cb (patch)
treee4d509405556fd523b3967dce483eb249fce85b7 /net-libs/xulrunner
parentMake zlib support mandatory - bug #367521. (diff)
downloadgentoo-2-6aa16bada0352fa8377bb78c436924bc34a159cb.tar.gz
gentoo-2-6aa16bada0352fa8377bb78c436924bc34a159cb.tar.bz2
gentoo-2-6aa16bada0352fa8377bb78c436924bc34a159cb.zip
only append -mno-avx on x86/amd64, add support for 64bit big indian machines
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/xulrunner')
-rw-r--r--net-libs/xulrunner/ChangeLog6
-rw-r--r--net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_indian.patch60
-rw-r--r--net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild9
3 files changed, 72 insertions, 3 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index d1e7d8718c72..bb0c6e012f0b 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/xulrunner
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.418 2011/05/16 00:35:06 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.419 2011/05/16 13:28:35 anarchy Exp $
+
+ 16 May 2011; Jory A. Pratt <anarchy@gentoo.org>
+ +files/mozilla-2.0_support_64bit_big_indian.patch, xulrunner-2.0.1-r1.ebuild:
+ only append -mno-avx on x86/amd64, add support for 64bit big indian machines
*xulrunner-2.0.1-r1 (16 May 2011)
diff --git a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_indian.patch b/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_indian.patch
new file mode 100644
index 000000000000..5814d81ba734
--- /dev/null
+++ b/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_indian.patch
@@ -0,0 +1,60 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1303461188 -7200
+# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
+# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
+Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \
+ platform.cc \
+ utils.cc \
+ $(NONE)
+
+ #
+ # END enclude sources for V8 dtoa
+ #############################################
+
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
++ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
+
+ VPATH += $(srcdir)/assembler \
+ $(srcdir)/assembler/wtf \
+ $(srcdir)/yarr/pcre \
+ $(NULL)
+
+ CPPSRCS += pcre_compile.cpp \
+ pcre_exec.cpp \
+
+# HG changeset patch
+# User Luke Wagner <lw@mozilla.com>
+# Date 1299520258 28800
+# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
+# Parent 27e5814815491ebb68e474e453aff6c2ea908c43
+Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
+
+diff --git a/js/src/jsval.h b/js/src/jsval.h
+--- a/js/src/jsval.h
++++ b/js/src/jsval.h
+@@ -342,16 +342,17 @@ typedef union jsval_layout
+ JSValueTag tag : 17;
+ uint64 payload47 : 47;
+ } debugView;
+ struct {
+ union {
+ int32 i32;
+ uint32 u32;
+ JSWhyMagic why;
++ jsuword word;
+ } payload;
+ } s;
+ double asDouble;
+ void *asPtr;
+ } jsval_layout;
+ # endif /* JS_BITS_PER_WORD */
+ #endif /* defined(IS_LITTLE_ENDIAN) */
+
+
+
diff --git a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
index 5e04c67af735..b151b19acdbc 100644
--- a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.1 2011/05/16 00:35:06 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.2 2011/05/16 13:28:35 anarchy Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -71,6 +71,9 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
+ #64bit big indian support
+ epatch "${FILESDIR}/mozilla-2.0_support_64bit_big_indian.patch"
+
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -143,7 +146,9 @@ src_configure() {
fi
# Ensure we do not fail on i{3,5,7} processors that support -mavx
- append-flags -mno-avx
+ if use amd64 || use x86; then
+ append-flags -mno-avx
+ fi
####################################
#