Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/
Date: Sun, 30 Sep 2018 22:48:09
Message-Id: 1538347663.59c0d28a9f6c6c8b44dfab3c041832d8a708ab4c.floppym@gentoo
1 commit: 59c0d28a9f6c6c8b44dfab3c041832d8a708ab4c
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 21:38:06 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 22:47:43 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c0d28a
7
8 www-client/chromium: allow forced clang to be disabled
9
10 Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 www-client/chromium/chromium-71.0.3559.6.ebuild | 9 +++++++--
14 1 file changed, 7 insertions(+), 2 deletions(-)
15
16 diff --git a/www-client/chromium/chromium-71.0.3559.6.ebuild b/www-client/chromium/chromium-71.0.3559.6.ebuild
17 index c458dff8774..a46167b6ff4 100644
18 --- a/www-client/chromium/chromium-71.0.3559.6.ebuild
19 +++ b/www-client/chromium/chromium-71.0.3559.6.ebuild
20 @@ -101,11 +101,16 @@ DEPEND="${COMMON_DEPEND}
21 sys-apps/hwids[usb(+)]
22 >=sys-devel/bison-2.4.3
23 sys-devel/flex
24 - >=sys-devel/clang-5
25 virtual/pkgconfig
26 dev-vcs/git
27 "
28
29 +: ${CHROMIUM_FORCE_CLANG=yes}
30 +
31 +if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
32 + DEPEND+=" >=sys-devel/clang-5"
33 +fi
34 +
35 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
36 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
37 fi
38 @@ -380,7 +385,7 @@ src_configure() {
39 # Make sure the build system will use the right tools, bug #340795.
40 tc-export AR CC CXX NM
41
42 - if ! tc-is-clang; then
43 + if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
44 # Force clang since gcc is pretty broken at the moment.
45 CC=${CHOST}-clang
46 CXX=${CHOST}-clang++