Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 06 Jul 2016 18:50:05
Message-Id: 1467830985.81fc1c44d2518da2bdb48bff5d465c35a8282b8e.kensington@gentoo
1 commit: 81fc1c44d2518da2bdb48bff5d465c35a8282b8e
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 19 13:18:18 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 6 18:49:45 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81fc1c44
7
8 kde5-functions.eclass: only perform the GCC version check if KDE_GCC_MINIMAL is defined
9
10 eclass/kde5-functions.eclass | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-)
12
13 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
14 index df5d053..2c45abc 100644
15 --- a/eclass/kde5-functions.eclass
16 +++ b/eclass/kde5-functions.eclass
17 @@ -76,7 +76,8 @@ export KDE_BUILD_TYPE
18 # @DESCRIPTION:
19 # Determine if the current GCC version is acceptable, otherwise die.
20 _check_gcc_version() {
21 - if [[ ${MERGE_TYPE} != binary ]]; then
22 + if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]]; then
23 +
24 local version=$(gcc-version)
25 local major=${version%.*}
26 local minor=${version#*.}