Fix the build on hardened by disabling V8 snapshot, bug #301880 by Damien

<damienkallison@gmail.com>
Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 19 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d561a1caf921..b6d9fd6ae0f7 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.81 2010/04/11 15:26:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.82 2010/04/11 17:54:34 phajdan.jr Exp $
+
+  11 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.371.0.ebuild, chromium-9999.ebuild:
+  Fix the build on hardened by disabling V8 snapshot, bug #301880 by Damien
+  <damienkallison@gmail.com>
 
   11 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-5.0.371.0.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 81c537bb9fc0..5f02066f01e4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,7 +14,7 @@ EBUILD chromium-5.0.342.7.ebuild 6565 RMD160 c36ab88fb6211e01358dbda562d54350be8
 EBUILD chromium-5.0.342.9.ebuild 6565 RMD160 7e4d556a9820abcdd46e0240d9116836b321bdcb SHA1 5e56e82d276b58298e76e015974aa2f888698c52 SHA256 7faab279b35573483cafc4ada425535f3f1552f53d3db20f306b9179e2a02b2e
 EBUILD chromium-5.0.360.5.ebuild 6565 RMD160 8bf565d0bacae19cd0e6ea407c81a888bc6f9aa5 SHA1 44484d9d2aba8f51a63a2f824b79fb2b9b83047f SHA256 646737d054efb4bf8793341c562afbf2181fc9a03d4d8ce34b2a3f65ddbb9e77
 EBUILD chromium-5.0.366.2.ebuild 6534 RMD160 8bc649c153aeed1df97e6a814e336e97654d837f SHA1 11b9f35fc7f7dedbbb9673ed9717d1954dcb6397 SHA256 ecabef1f0c9c8cad45349caa9734b7b0fa96285c177c3f19772a63be9ddbebaf
-EBUILD chromium-5.0.371.0.ebuild 6536 RMD160 256737feea89c3add8d1a15502251c6e68b9c745 SHA1 f903a5d485668f907a40631fdaaef2dcbeeb0d18 SHA256 b058279f439ecce78e02452dffa260253baf71d57b31325400bda0b68b4c8123
-EBUILD chromium-9999.ebuild 8289 RMD160 d1dd70d16b008b8ac7ca81f6b54ef0f3b86e15a6 SHA1 24666eae3feb6133e98dfd9575e7821f152fadcd SHA256 872794d2819ad0161429a7a463481b072ed96700ce3df6be6403476d7bbc3321
-MISC ChangeLog 18591 RMD160 0987d1c6156d5a23e318b2d8cedc9590896fe8f8 SHA1 a50419b4bddd43516a6ea58ea38419a2f1b01953 SHA256 637968c2925d61624f1e4f7e2750a81635c9b2e6bc427f05b5f3057b29eba690
+EBUILD chromium-5.0.371.0.ebuild 6696 RMD160 66a65a7fb9f6cf06671c126d91c0a0da58ef412e SHA1 0bdd1507d806b3a152bae02df6a60f988d2f28d5 SHA256 c78a15945e5f59cffc000a9ca00eadaf5e8e8912496092dd54c12c9328d32363
+EBUILD chromium-9999.ebuild 8449 RMD160 77cd51f75d4e4c447b8fc70939fd998a4945850b SHA1 1296fb44676628013884ef656f8fdca894881c1f SHA256 d6f7df8f64776e65644e0b1acb3517ec1b7f95a4e0aefc583e39ead47c19d54f
+MISC ChangeLog 18803 RMD160 18005108c831f6c1b57f09a3bd7a76d7d03fe459 SHA1 d6eb17db015c8e9645d4f43a60e1b8bf02a74238 SHA256 faf2352e140112e5fe38b09645788f22b4464f9569cd904b0647f078b2c22e96
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
diff --git a/www-client/chromium/chromium-5.0.371.0.ebuild b/www-client/chromium/chromium-5.0.371.0.ebuild
index 35796352a055..b49a3484199b 100644
--- a/www-client/chromium/chromium-5.0.371.0.ebuild
+++ b/www-client/chromium/chromium-5.0.371.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v 1.3 2010/04/11 15:26:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v 1.4 2010/04/11 17:54:34 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -127,6 +127,10 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
+	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
+	# and the performance gain isn't worth it.
+	myconf="${myconf} -Dv8_use_snapshot=0"
+
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"
 	[[ $myarch = "" ]] && myarch="$ARCH"
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 098dc199e9a7..513064df9c47 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.40 2010/04/11 15:26:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.41 2010/04/11 17:54:34 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -171,6 +171,10 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
+	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
+	# and the performance gain isn't worth it.
+	myconf="${myconf} -Dv8_use_snapshot=0"
+
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"
 	[[ $myarch = "" ]] && myarch="$ARCH"