commit: 61f4607ed8d02e97d3250fc86a29d94a3bca7cdd
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 7 21:44:36 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 21:44:36 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=61f4607e
qt5-build.eclass: don't run gcc version checks if compiler is not gcc
Gentoo-Bug: 587582
eclass/qt5-build.eclass | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5c3acd8..f9de34e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -136,19 +136,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure
src_compile src_install sr
# @DESCRIPTION:
# Unpacks the sources.
qt5-build_src_unpack() {
- local min_gcc4_minor_version=5
- if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
- min_gcc4_minor_version=7
- fi
- if [[ $(gcc-major-version) -lt 4 ]] || \
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt
${min_gcc4_minor_version} ]]; then
- if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
- eerror "GCC version 4.${min_gcc4_minor_version} or
later is required to build this package"
- die "GCC 4.${min_gcc4_minor_version} or later required"
- else
- ewarn
- ewarn "Using a GCC version lower than
4.${min_gcc4_minor_version} is not supported"
- ewarn
+ if tc-is-gcc; then
+ local min_gcc4_minor_version=5
+ if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]];
then
+ min_gcc4_minor_version=7
+ fi
+ if [[ $(gcc-major-version) -lt 4 ]] || \
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt
${min_gcc4_minor_version} ]]; then
+ if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+ eerror "GCC version 4.${min_gcc4_minor_version}
or later is required to build this package"
+ die "GCC 4.${min_gcc4_minor_version} or later
required"
+ else
+ ewarn
+ ewarn "Using a GCC version lower than
4.${min_gcc4_minor_version} is not supported"
+ ewarn
+ fi
fi
fi
