Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Thu, 07 Jul 2016 13:53:46
Message-Id: 1467898946.4568388740ae34ea63221ed05f7daa857f8066b5.kensington@gentoo
1 commit: 4568388740ae34ea63221ed05f7daa857f8066b5
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 7 13:42:22 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 7 13:42:26 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=45683887
7
8 kde4-base.eclass: don't perform gcc version check with clang
9
10 Gentoo-bug: 587998
11
12 eclass/kde4-base.eclass | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
16 index 59a1932..f9e7eeb 100644
17 --- a/eclass/kde4-base.eclass
18 +++ b/eclass/kde4-base.eclass
19 @@ -639,7 +639,7 @@ kde4-base_pkg_setup() {
20 # In theory should be in pkg_pretend but we check it only for kdelibs there
21 # and for others we do just quick scan in pkg_setup because pkg_pretend
22 # executions consume quite some time (ie. when merging 300 packages at once will cause 300 checks)
23 - if [[ ${MERGE_TYPE} != binary ]]; then
24 + if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
25 [[ $(gcc-major-version) -lt 4 ]] || \
26 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 6 ]] ) \
27 && die "Sorry, but gcc-4.6 and earlier wont work for some KDE packages."