Forgot patch for x86 users, to prevent automatic enabling of -march=pentium4 -msse2

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 53 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d23e80422d83..2a6fd67a1c77 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1 2009/09/16 13:31:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.2 2009/09/16 14:02:41 voyageur Exp $
+
+  16 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/chromium-drop_sse2.patch, chromium-4.0.210.0_p26329.ebuild:
+  Forgot patch for x86 users, to prevent automatic enabling of
+  -march=pentium4 -msse2
 
 *chromium-4.0.210.0_p26329 (16 Sep 2009)
 
diff --git a/www-client/chromium/chromium-4.0.210.0_p26329.ebuild b/www-client/chromium/chromium-4.0.210.0_p26329.ebuild
index 82df5887582f..49806dc41a4e 100644
--- a/www-client/chromium/chromium-4.0.210.0_p26329.ebuild
+++ b/www-client/chromium/chromium-4.0.210.0_p26329.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.210.0_p26329.ebuild,v 1.1 2009/09/16 13:31:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.210.0_p26329.ebuild,v 1.2 2009/09/16 14:02:41 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -43,6 +43,8 @@ src_prepare() {
 
 	# Changing this in ~/include.gypi does not work
 	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
+	# Prevent automatic -march=pentium4 -msse2 enabling on x86
+	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
 
 	# Temporarly use this gyp_chromium instead of tools/gyp/ one
 	chmod +x build/gyp_chromium
diff --git a/www-client/chromium/files/chromium-drop_sse2.patch b/www-client/chromium/files/chromium-drop_sse2.patch
new file mode 100644
index 000000000000..bece9acb837a
--- /dev/null
+++ b/www-client/chromium/files/chromium-drop_sse2.patch
@@ -0,0 +1,44 @@
+---
+ build/common.gypi |   19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+Index: src/build/common.gypi
+===================================================================
+--- src.orig/build/common.gypi
++++ src/build/common.gypi
+@@ -386,25 +386,26 @@
+             #
+             # -mfpmath=sse -msse2 makes the compiler use SSE instructions
+             # which keep floating-point values in SSE registers in its
+             # native precision (32-bit for single precision, and 64-bit for
+             # double precision values). This means the floating-point value
+             # used during computation does not change depending on how the
+             # compiler optimized the code, since the value is always kept
+             # in its specified precision.
+-            'conditions': [
+-              ['branding=="Chromium"', {
+-                'cflags': [
+-                  '-march=pentium4',
+-                  '-msse2',
+-                  '-mfpmath=sse',
+-                ],
+-              }],
+-            ],
++            # Disabled: see http://code.google.com/p/chromium/issues/detail?id=9007
++            # 'conditions': [
++            #   ['branding=="Chromium"', {
++            #     'cflags': [
++            #       '-march=pentium4',
++            #       '-msse2',
++            #       '-mfpmath=sse',
++            #     ],
++            #   }],
++            # ],
+             'cflags': [
+               '-m32',
+             ],
+             'ldflags': [
+               '-m32',
+             ],
+           }],
+         ],