From 97690bdef2799734a6a8bae0fbcd48cf5381a548 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sat, 23 Jan 2016 02:31:31 +0100 Subject: [PATCH] qt5-build.eclass: update gcc version check for 5.7 and qtwebengine (cherry picked from proj/qt commit 8ed3b65dd6316568c74cad5485936abd7f4f36a4) --- eclass/qt5-build.eclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index f71a35e4a270..1830d21a09c1 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -127,9 +127,14 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr # @DESCRIPTION: # Unpacks the sources. qt5-build_src_unpack() { - if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]]; 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 ewarn - ewarn "Using a GCC version lower than 4.5 is not supported." + ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported." ewarn fi -- 2.26.2