Fix build issues with _mm_crc32_u64, bug #459126 by Nuno.

(Portage version: 2.1.11.52/cvs/Linux i686, signed Manifest commit with key 30427902)

5 files changed, 40 insertions, 4 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b017abb71a66..d0e96d855706 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.844 2013/03/13 23:27:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.845 2013/03/14 00:59:34 phajdan.jr Exp $
+
+  14 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-smhasher-r0.patch, chromium-25.0.1364.172.ebuild,
+  chromium-26.0.1410.28.ebuild, chromium-27.0.1438.7.ebuild:
+  Fix build issues with _mm_crc32_u64, bug #459126 by Nuno.
 
   13 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-26.0.1410.28.ebuild, chromium-27.0.1438.7.ebuild,
diff --git a/www-client/chromium/chromium-25.0.1364.172.ebuild b/www-client/chromium/chromium-25.0.1364.172.ebuild
index 21f701895f1a..98f81f8f1193 100644
--- a/www-client/chromium/chromium-25.0.1364.172.ebuild
+++ b/www-client/chromium/chromium-25.0.1364.172.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.172.ebuild,v 1.1 2013/03/13 00:24:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.172.ebuild,v 1.2 2013/03/14 00:59:34 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
@@ -161,6 +161,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
 
+	# Fix build issue with smhasher, bug #459126 .
+	epatch "${FILESDIR}/${PN}-smhasher-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
diff --git a/www-client/chromium/chromium-26.0.1410.28.ebuild b/www-client/chromium/chromium-26.0.1410.28.ebuild
index d0b4f98bb6a8..b994afe688b0 100644
--- a/www-client/chromium/chromium-26.0.1410.28.ebuild
+++ b/www-client/chromium/chromium-26.0.1410.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.28.ebuild,v 1.2 2013/03/13 23:27:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.28.ebuild,v 1.3 2013/03/14 00:59:34 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -138,6 +138,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-jsoncpp-path-r0.patch"
 
+	# Fix build issue with smhasher, bug #459126 .
+	epatch "${FILESDIR}/${PN}-smhasher-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
diff --git a/www-client/chromium/chromium-27.0.1438.7.ebuild b/www-client/chromium/chromium-27.0.1438.7.ebuild
index d83c5af7208b..c3da25cc3c3e 100644
--- a/www-client/chromium/chromium-27.0.1438.7.ebuild
+++ b/www-client/chromium/chromium-27.0.1438.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1438.7.ebuild,v 1.2 2013/03/13 23:27:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1438.7.ebuild,v 1.3 2013/03/14 00:59:34 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -133,6 +133,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
 
+	# Fix build issue with smhasher, bug #459126 .
+	epatch "${FILESDIR}/${PN}-smhasher-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
diff --git a/www-client/chromium/files/chromium-smhasher-r0.patch b/www-client/chromium/files/chromium-smhasher-r0.patch
new file mode 100644
index 000000000000..06dcd4e8ed13
--- /dev/null
+++ b/www-client/chromium/files/chromium-smhasher-r0.patch
@@ -0,0 +1,22 @@
+--- third_party/smhasher/src/City.cpp.orig	2013-03-13 23:48:29.232407565 +0000
++++ third_party/smhasher/src/City.cpp	2013-03-13 23:49:24.092714006 +0000
+@@ -351,7 +351,7 @@
+   }
+ }
+ 
+-#ifdef __SSE4_2__
++#if defined(__SSE4_2__) && defined(__x86_64__)
+ #include <nmmintrin.h>
+ 
+ // Requires len >= 240.
+--- third_party/smhasher/src/City.h.orig	2013-03-13 23:49:50.122859412 +0000
++++ third_party/smhasher/src/City.h	2013-03-13 23:50:18.043015349 +0000
+@@ -90,7 +90,7 @@
+ 
+ // Conditionally include declarations for versions of City that require SSE4.2
+ // instructions to be available.
+-#ifdef __SSE4_2__
++#if defined(__SSE4_2__) && defined(__x86_64__)
+ 
+ // Hash function for a byte array.
+ uint128 CityHashCrc128(const char *s, size_t len);