Sparc fix by Raúl Porcel for bug #389963.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

6 files changed, 35 insertions, 9 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index b14820144185..da71aa0e9bdb 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.145 2012/03/06 16:23:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.146 2012/03/17 19:22:58 tetromino Exp $
+
+  17 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-1.6.1-r201.ebuild, webkit-gtk-1.6.1-r301.ebuild,
+  +files/webkit-gtk-1.6.1-sparc-needs-alignment.patch,
+  webkit-gtk-1.6.3-r200.ebuild, webkit-gtk-1.6.3-r300.ebuild:
+  Sparc fix by Raúl Porcel for bug #389963.
 
   06 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   files/gir-paxctl-lt-wrapper, webkit-gtk-1.6.3-r200.ebuild,
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch
new file mode 100644
index 000000000000..2b678e5f9469
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch
@@ -0,0 +1,12 @@
+diff -aur a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
+--- a/Source/JavaScriptCore/wtf/Platform.h	2012-02-25 11:10:13.000000000 +0000
++++ b/Source/JavaScriptCore/wtf/Platform.h	2012-02-25 11:26:17.992010602 +0000
+@@ -295,7 +295,7 @@
+ 
+ #endif /* ARM */
+ 
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
index c81d583286ba..38fe903eeb67 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.8 2012/03/05 22:15:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.9 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -77,6 +77,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -116,7 +118,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
index 81bb15afe8a2..5f031b27862b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.8 2012/03/05 22:15:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.9 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -79,6 +79,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -109,7 +111,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
index 39f58fb53045..7c16d5327cc3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild,v 1.4 2012/03/06 16:23:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild,v 1.5 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -72,6 +72,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -115,7 +117,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
index 3ac7263c3954..5dcedce5ff2e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.5 2012/03/06 16:23:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.6 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -73,6 +73,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -107,7 +109,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"