Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 02 Feb 2016 18:35:43
Message-Id: 1454438111.97690bdef2799734a6a8bae0fbcd48cf5381a548.pesa@gentoo
1 commit: 97690bdef2799734a6a8bae0fbcd48cf5381a548
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 23 01:31:31 2016 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 18:35:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97690bde
7
8 qt5-build.eclass: update gcc version check for 5.7 and qtwebengine
9
10 (cherry picked from proj/qt commit 8ed3b65dd6316568c74cad5485936abd7f4f36a4)
11
12 eclass/qt5-build.eclass | 9 +++++++--
13 1 file changed, 7 insertions(+), 2 deletions(-)
14
15 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
16 index f71a35e..1830d21 100644
17 --- a/eclass/qt5-build.eclass
18 +++ b/eclass/qt5-build.eclass
19 @@ -127,9 +127,14 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
20 # @DESCRIPTION:
21 # Unpacks the sources.
22 qt5-build_src_unpack() {
23 - if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]]; then
24 + local min_gcc4_minor_version=5
25 + if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
26 + min_gcc4_minor_version=7
27 + fi
28 + if [[ $(gcc-major-version) -lt 4 ]] || \
29 + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
30 ewarn
31 - ewarn "Using a GCC version lower than 4.5 is not supported."
32 + ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported."
33 ewarn
34 fi