| 1 |
commit: 0e99f0212017dd9dd5fcec9805da564ef666e457 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 15 13:47:56 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 15 13:47:56 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e99f021 |
| 7 |
|
| 8 |
www-client/chromium: copy CHROMIUM_FORCE_CLANG for M69 and M70 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.50_p14, Repoman-2.3.11_p21 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/chromium/chromium-69.0.3497.100.ebuild | 11 ++++++++--- |
| 14 |
www-client/chromium/chromium-70.0.3538.54.ebuild | 9 +++++++-- |
| 15 |
2 files changed, 15 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/chromium/chromium-69.0.3497.100.ebuild b/www-client/chromium/chromium-69.0.3497.100.ebuild |
| 18 |
index 9b12bab541e..dc4c6f3f334 100644 |
| 19 |
--- a/www-client/chromium/chromium-69.0.3497.100.ebuild |
| 20 |
+++ b/www-client/chromium/chromium-69.0.3497.100.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2018 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI="6" |
| 27 |
@@ -101,11 +101,16 @@ DEPEND="${COMMON_DEPEND} |
| 28 |
sys-apps/hwids[usb(+)] |
| 29 |
>=sys-devel/bison-2.4.3 |
| 30 |
sys-devel/flex |
| 31 |
- >=sys-devel/clang-5 |
| 32 |
virtual/pkgconfig |
| 33 |
dev-vcs/git |
| 34 |
" |
| 35 |
|
| 36 |
+: ${CHROMIUM_FORCE_CLANG=yes} |
| 37 |
+ |
| 38 |
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
| 39 |
+ DEPEND+=" >=sys-devel/clang-5" |
| 40 |
+fi |
| 41 |
+ |
| 42 |
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
| 43 |
EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
| 44 |
fi |
| 45 |
@@ -371,7 +376,7 @@ src_configure() { |
| 46 |
# Make sure the build system will use the right tools, bug #340795. |
| 47 |
tc-export AR CC CXX NM |
| 48 |
|
| 49 |
- if ! tc-is-clang; then |
| 50 |
+ if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then |
| 51 |
# Force clang since gcc is pretty broken at the moment. |
| 52 |
CC=${CHOST}-clang |
| 53 |
CXX=${CHOST}-clang++ |
| 54 |
|
| 55 |
diff --git a/www-client/chromium/chromium-70.0.3538.54.ebuild b/www-client/chromium/chromium-70.0.3538.54.ebuild |
| 56 |
index 536322cbe16..6f977615985 100644 |
| 57 |
--- a/www-client/chromium/chromium-70.0.3538.54.ebuild |
| 58 |
+++ b/www-client/chromium/chromium-70.0.3538.54.ebuild |
| 59 |
@@ -101,11 +101,16 @@ DEPEND="${COMMON_DEPEND} |
| 60 |
sys-apps/hwids[usb(+)] |
| 61 |
>=sys-devel/bison-2.4.3 |
| 62 |
sys-devel/flex |
| 63 |
- >=sys-devel/clang-5 |
| 64 |
virtual/pkgconfig |
| 65 |
dev-vcs/git |
| 66 |
" |
| 67 |
|
| 68 |
+: ${CHROMIUM_FORCE_CLANG=yes} |
| 69 |
+ |
| 70 |
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
| 71 |
+ DEPEND+=" >=sys-devel/clang-5" |
| 72 |
+fi |
| 73 |
+ |
| 74 |
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
| 75 |
EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
| 76 |
fi |
| 77 |
@@ -381,7 +386,7 @@ src_configure() { |
| 78 |
# Make sure the build system will use the right tools, bug #340795. |
| 79 |
tc-export AR CC CXX NM |
| 80 |
|
| 81 |
- if ! tc-is-clang; then |
| 82 |
+ if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then |
| 83 |
# Force clang since gcc is pretty broken at the moment. |
| 84 |
CC=${CHOST}-clang |
| 85 |
CXX=${CHOST}-clang++ |
Archives