The ugly build system doesn't properly disable JIT in all places causing problems in some arches. Try to really disable it when jit is wanted to be disabled

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 21 insertions, 9 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 86138615fc8d..ed0817fad3b4 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.249 2014/03/04 20:21:03 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.250 2014/03/08 08:49:45 pacho Exp $
+
+  08 Mar 2014; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.2.5-r200.ebuild,
+  webkit-gtk-2.2.5.ebuild:
+  The ugly build system doesn't properly disable JIT in all places causing
+  problems in some arches. Try to really disable it when jit is wanted to be
+  disabled
 
   04 Mar 2014; Vicente Olivert Riera <vincent@gentoo.org>
   webkit-gtk-2.2.5.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1ae0b060e901..8da408134dc5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -49,14 +49,14 @@ EBUILD webkit-gtk-1.8.3-r200.ebuild 9156 SHA256 10a39327ff264ad68e04a027342e62b9
 EBUILD webkit-gtk-1.8.3-r201.ebuild 9610 SHA256 d624ff02d974fd706c4f0511182ca2227a550f10a936f4d5e003d64b4ef7b5f5 SHA512 0ee9bfd80d36d82487d9ad2789b3046fb0a1d34081c4905ab6cc661890b757b445edcfb1396cedeb5b6d79ec9f3835757f234c2abd43d37d78b992b671db9816 WHIRLPOOL f812239bb7803677acc4250d7f1e2517dc00669dd6d683af44225b4ac5b0b09934ce8c135a60481415215d1d2925beb30e1e988cc55d371fff1d2df7918883ca
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9759 SHA256 9404a95936f1c043a71dd94f6681dfeb4e194dcd5f474af0663c80faba4b6bd5 SHA512 a99bcd2462838a39db811839f1d16f1d163c8d6916a891419fdf6458eacb8073eef117e0a5e77f5ffcd322f8e7f7c8806f7e291eeb7f08c1ccd869b7efa346e1 WHIRLPOOL e78d3d3327e214f7c231ae1e54a81012608dde15f5faa0243f73d4cb0b84dd064feb73e496e0834e70ce52d1fcb252cd7cbc8dad074a4f0f96aa3e53ea699a4d
 EBUILD webkit-gtk-2.0.4.ebuild 9039 SHA256 296e9efaefad105ff350d7669d2c5baebd9fe796719238ee5a39646901198279 SHA512 3550522141269c643a86546e89ee12f8045033423219efad21ebf138144e296006735c6c1d6980c1bb74564a338dded14fea809490471895c060beac4dbe4720 WHIRLPOOL 14f043df57bfbf36664c06b77f80d7f2f69f36b8efb9f76fa18bfa93306c541f7c4799f2de34beaf60cdbe95540c844e4b3617bdd39176d14cc9f2a855aeea6c
-EBUILD webkit-gtk-2.2.5-r200.ebuild 9514 SHA256 0d22e9c6b1b898fad1e03a11d3943d97f8c0c243dc0299643601391a997b9ac8 SHA512 d4533736cc96e3d0ecedf7482a9b453b7fc7830025c1694a528d31d11bec17ea051435c08b12c1fe168b06f7551d986baca7c409f83f0131541f52863eb6bd9c WHIRLPOOL 8f40c486dff027a90c67dcc580b1e44092feddad2c2a5f9a4b2a8821723c2cbc76842af61bb633e002c30bc345c98ea7bf607c2268ca68a70fc12305a13cd774
-EBUILD webkit-gtk-2.2.5.ebuild 9610 SHA256 846805a19fd3f2f7ed146db9619f3f82d6f15c73cfc7dfe309ab687315a1fc51 SHA512 c89ffbabe6274e624892e1c7505787fec37dc2d1e24debff55126584a51fb4c53ddaa35f8f437a1cfb3bacb62a6d1c2037f82126d6c11821bc2d3d396c962356 WHIRLPOOL 5f157826be89ed738b48d1eb371c02fbcd29d677cbd85a6d7de7f834b2c3a74390ce746fba33a4b1ff879b513d09c3aeabd618e9754ad7d2f0cf8ed95eace0f3
-MISC ChangeLog 50540 SHA256 3ba2dd1b63f6e2a3d36f0fb7f7a8712611b49c23707128f94e2800ef8a648901 SHA512 ba676a99743cfec22aeea3d97ba00f832bf7843fa033ce45b60a0b0df9c269a75383fb939b06d82db9a293fe89d142bb42ce33088d8a09b3667f8a97eff0ab77 WHIRLPOOL 0183345c927c5b489606fa9af7ee2aef4dc15829843335af67f45e65d099057b6a15bcf5cbd85c01e0e26ee8e7764adb5519500792f3c9fa97ea24f9e8ec2386
+EBUILD webkit-gtk-2.2.5-r200.ebuild 9677 SHA256 fdd3ad1f8a5275008725b6767efaef0ffe1c782a74f0d82e1b933361dc8dc072 SHA512 531312e8cd767d6ecd50d942d37baff85f1a18273c5a03c2c1755f6a2e60f017f40d8021ef3fea21a3e9792d19f3b668a80e87c43a6ca52346d342f375e72615 WHIRLPOOL 05855d5654b5f7469baab385dd256594507374762dd93bb07371e3463d5b5e93c3a0e7514382c4e1008ee91a459a302edba7c41451d47bc72810db172f517f34
+EBUILD webkit-gtk-2.2.5.ebuild 9773 SHA256 b5b38fa80f17a898611e0649a04de50e29e4410a7a4e20d28e49fee33c6cf24e SHA512 782f69723661ccc51133ea71534d49d774ce77d0924d8fe24b25d49bf19cfeac118af6bdf0430d2cdf29091ff9118785eaf2d56c655dc402706e4e9712338fb1 WHIRLPOOL 4109ccb4aff687b27a9025f0d0f1147a45c1726e09fb75cf869c85587db7450de77e2d2e416dca022ae9b13f6002a77df247fb6b7fd6192fca158c6c7d520174
+MISC ChangeLog 50805 SHA256 5a282fd8ae998d2a79307e2fdbb6ebd1f693aace395390707592d1018cf917a8 SHA512 18611681a2f301c3c1eaa7d40f33c75e7e015560b5510878ee3e2e27e2368b6e5e11833cc329eaa3f94f0f2fbe78b953e5669603baba99bb0e87d1992f330c4f WHIRLPOOL 31c398849a7c8e26d7127fd27a27a6dad23e69f517de22a436c318562c2e8c4fe3436fb42b23f7a5107ba3b14dd5df86b794cade438aef474b203202d62d7e8a
 MISC metadata.xml 735 SHA256 25d9027d26b4842187348aa43666ea6e00af2a55fb16d4fae447e81a59c072be SHA512 4c67d850758b3bf54a5de45e35797d2cb2133776e15d729f81aa592e4d4b58e7c9869ed476c25a6dc442bfc131961875e433e3c3fa73e693cf948eeed2230fa8 WHIRLPOOL c5bc56d53e735e5b9cd8dd03ca55ae5380f2ddb333118797b222914307c57248cc8f55cab80abfd41d1054a9e856c8e1d3f88f2aa36fb7cb885d7f3e442dd307
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMWNbQACgkQWunnsum7y6i4WACePE7NUdIM3+JCEv1OQXPveW6S
-cBEAn2cnY6YG5ViMeNHeLX3+K4/3mTk4
-=HRn6
+iEYEAREIAAYFAlMa2aoACgkQCaWpQKGI+9RpXQCfT2ACKjx1U7Zdfeme9E/3vT0S
+tsAAn384W1XBPq4wsVx792VCfXim6wfB
+=0tnN
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
index 2200a88ec87e..97ba3052c38b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild,v 1.5 2014/03/04 19:41:49 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild,v 1.6 2014/03/08 08:49:45 pacho Exp $
 
 EAPI="5"
 
@@ -183,6 +183,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
 	# It doesn't compile on alpha without this in LDFLAGS, bug #???
 	use alpha && append-ldflags "-Wl,--no-relax"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
index 4aa6a682f61a..28bb7d5f9b91 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild,v 1.5 2014/03/04 20:21:03 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild,v 1.6 2014/03/08 08:49:45 pacho Exp $
 
 EAPI="5"
 
@@ -188,6 +188,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
 	# It doesn't compile on alpha without this in LDFLAGS, bug #???
 	use alpha && append-ldflags "-Wl,--no-relax"