Add patch to fix build on ARM, enable v8 build on ARM

Package-Manager: portage-2.1.6.13/cvs/Linux ia64

4 files changed, 85 insertions, 7 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 3a5c8dcbfc7c..e472463e1fc6 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.33 2009/12/25 18:10:23 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.34 2010/01/07 16:01:23 armin76 Exp $
+
+  07 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  +files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
+  Add patch to fix build on ARM, enable v8 build on ARM
 
   25 Dec 2009; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
   chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 86c9f5a769b8..5dd50209400a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,4 @@
+AUX chromium-drop_armel_m32.patch 2235 RMD160 5e401922a58e6c08ed08e8e6a7c437d7391abbf7 SHA1 dfadce3360923a16326e1daffbd0539e101deb58 SHA256 caf42f8ba2f3aadae233e4f5a9c500c048fddb8eba85cb6a20879bd149fcb9a3
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa
@@ -10,6 +11,6 @@ EBUILD chromium-4.0.249.43.ebuild 4311 RMD160 b205bc9817502c2bf87d1beb8b0aad8baa
 EBUILD chromium-4.0.251.0.ebuild 4308 RMD160 c3d14c30eb344464aab788ea3414e03193ed7b7f SHA1 2ec1dd841fad0fe686b42db94d9fd006199af9d4 SHA256 bb63752ad5b7ca775aa61d29c6c3857a3a9a52289cb74fa8a4c592d7bff030d4
 EBUILD chromium-4.0.260.0.ebuild 4295 RMD160 e7d11073a00989e1726295bd485ac7864a3cacf5 SHA1 67b856ec1d5cdb3f17d6f97cfc80df1aa1202d17 SHA256 b1969d6de64b19ef3edcf5a21cfcffe52490760c9f3c2fb63eb3cc573d306326
 EBUILD chromium-4.0.266.0.ebuild 4571 RMD160 feb35b9cd8d1b353d8efb972df902c990f36dbee SHA1 ae9ee2ae4e9c44bfe4e447dd63da3ec6b5aede44 SHA256 54b5eecea6ad128b87441d40acfdc8337f7a142aaf9ba7c79eb1263f05ee8956
-EBUILD chromium-9999.ebuild 6289 RMD160 f484bf643567ef16e0553e74632afd9806ec8782 SHA1 376d75623d7e48136eaa38c812773ffe73d75ba6 SHA256 daf10aa381e4c1202fbb55fc764c1f64b366055df9f93cdc3e7435c3ff243442
-MISC ChangeLog 7478 RMD160 d0cc2fbaab0c503a2885eb0687558a4568ab8408 SHA1 3ce85f94054eecea2872717ae3f4112b00293876 SHA256 939f7844cf209e381047cae4d6428a8160f695c566f0440f5adaf1933593f473
+EBUILD chromium-9999.ebuild 6365 RMD160 c40a859ed1c372efaa6e61b2d5d8bf4372314606 SHA1 84ad4d9b8ab57e383ccecd3b40717baf0cfca9f9 SHA256 a53802478c21a212b03e095a27789129d1a28f5dcde125cbf5aa3453cbe59b04
+MISC ChangeLog 7646 RMD160 1aa61d7fc4ade23de93f873b78ddf76e58eafffd SHA1 b30c2a025e813104e162eaef70ceda67af825f40 SHA256 0022f5a341731dd8b33d9f9356c282cab80a56764fb965b396416196b3ff3739
 MISC metadata.xml 578 RMD160 a6e635fb90171f5698b32ef0ed36747f921f8aed SHA1 f72cfb81f43187583315e032db709083742aeb41 SHA256 9f3586e43f40a626d328c426b96966ac7e91d04095c71d16a1573bef60e46fa1
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index de2392a0c58c..c76851d89632 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.14 2009/12/25 18:10:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.15 2010/01/07 16:01:23 armin76 Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs subversion
@@ -92,6 +92,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
 	# Add configuration flag to use system libevent
 	epatch "${FILESDIR}"/${PN}-use_system_libevent-1.4.13.patch
+	# Fix native build on ARM, http://crbug.com/31274
+	epatch "${FILESDIR}"/${PN}-drop_armel_m32.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
@@ -131,7 +133,7 @@ EOF
 	fi
 
 	if use arm; then
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dv8_use_snapshot=false -Dlinux_use_tcmalloc=0"
+		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
 	fi
 
 	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
diff --git a/www-client/chromium/files/chromium-drop_armel_m32.patch b/www-client/chromium/files/chromium-drop_armel_m32.patch
new file mode 100644
index 000000000000..0282b65490cc
--- /dev/null
+++ b/www-client/chromium/files/chromium-drop_armel_m32.patch
@@ -0,0 +1,71 @@
+---
+ v8/tools/gyp/v8.gyp |   12 ------------
+ 1 file changed, 12 deletions(-)
+
+Index: src/v8/tools/gyp/v8.gyp
+===================================================================
+--- src.orig/v8/tools/gyp/v8.gyp
++++ src/v8/tools/gyp/v8.gyp
+@@ -196,20 +196,16 @@
+         '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
+         '../../src/snapshot-empty.cc',
+       ],
+       'conditions': [
+         # The ARM assembler assumes the host is 32 bits, so force building
+         # 32-bit host tools.
+         # TODO(piman): This assumes that the host is ia32 or amd64. Fixing the
+         # code would be better
+-        ['target_arch=="arm" and _toolset=="host"', {
+-          'cflags': ['-m32'],
+-          'ldflags': ['-m32'],
+-        }]
+       ]
+     },
+     {
+       'target_name': 'v8_base',
+       'type': '<(library)',
+       'toolsets': ['host', 'target'],
+       'include_dirs+': [
+         '../../src',
+@@ -425,20 +421,16 @@
+             '../../src/arm/virtual-frame-arm.cc',
+             '../../src/arm/virtual-frame-arm.h',
+           ],
+           'conditions': [
+             # The ARM assembler assumes the host is 32 bits, so force building
+             # 32-bit host tools.
+             # TODO(piman): This assumes that the host is ia32 or amd64. Fixing
+             # the code would be better
+-            ['_toolset=="host"', {
+-              'cflags': ['-m32'],
+-              'ldflags': ['-m32'],
+-            }]
+           ]
+         }],
+         ['target_arch=="ia32"', {
+           'include_dirs+': [
+             '../../src/ia32',
+           ],
+           'sources': [
+             '../../src/ia32/assembler-ia32-inl.h',
+@@ -595,20 +587,16 @@
+       'sources': [
+         '../../src/mksnapshot.cc',
+       ],
+       'conditions': [
+         # The ARM assembler assumes the host is 32 bits, so force building
+         # 32-bit host tools.
+         # TODO(piman): This assumes that the host is ia32 or amd64. Fixing
+         # the code would be better
+-        ['target_arch=="arm" and _toolset=="host"', {
+-          'cflags': ['-m32'],
+-          'ldflags': ['-m32'],
+-        }]
+       ]
+     },
+     {
+       'target_name': 'v8_shell',
+       'type': 'executable',
+       'dependencies': [
+         'v8'
+       ],