summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2015-02-19 11:22:31 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2015-02-19 11:22:31 +0000
commitce81b883caee0439678c85bd79d138c8505f780e (patch)
tree9f8f86f431d5bd6f8b69ce96e2fc49f8eca4b1d7 /www-client/chromium
parentFix wrong digest for 2.1 tarball (diff)
downloadgentoo-2-ce81b883caee0439678c85bd79d138c8505f780e.tar.gz
gentoo-2-ce81b883caee0439678c85bd79d138c8505f780e.tar.bz2
gentoo-2-ce81b883caee0439678c85bd79d138c8505f780e.zip
Fix build with clang, bug #502456 by andrey.kudryavtsev
(Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/chromium-42.0.2305.3.ebuild10
2 files changed, 13 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 16646ff77c1e..0648c61035d2 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1200 2015/02/18 09:22:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1201 2015/02/19 11:22:31 phajdan.jr Exp $
+
+ 19 Feb 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ chromium-42.0.2305.3.ebuild:
+ Fix build with clang, bug #502456 by andrey.kudryavtsev
*chromium-42.0.2305.3 (18 Feb 2015)
diff --git a/www-client/chromium/chromium-42.0.2305.3.ebuild b/www-client/chromium/chromium-42.0.2305.3.ebuild
index bb838dd20b87..41ccfb2fefd1 100644
--- a/www-client/chromium/chromium-42.0.2305.3.ebuild
+++ b/www-client/chromium/chromium-42.0.2305.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2305.3.ebuild,v 1.1 2015/02/18 09:22:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-42.0.2305.3.ebuild,v 1.2 2015/02/19 11:22:31 phajdan.jr Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -392,10 +392,16 @@ src_configure() {
myconf+="
-Dlogging_like_official_build=1"
+ if [[ $(tc-getCC) == *clang* ]]; then
+ myconf+=" -Dclang=1"
+ else
+ myconf+=" -Dclang=0"
+ fi
+
# Never use bundled gold binary. Disable gold linker flags for now.
# Do not use bundled clang.
myconf+="
- -Dclang=0
+ -Dclang_use_chrome_plugins=0
-Dhost_clang=0
-Dlinux_use_bundled_binutils=0
-Dlinux_use_bundled_gold=0