From 4c6377e845cc7b0150a664e075d83b0fa0e0d749 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <pesa@gentoo.org>
Date: Sun, 13 Mar 2016 02:14:52 +0100
Subject: qt5-build.eclass: simplify gcc version check, add eerror

(cherry picked from proj/qt commit e2c27b48a98cb8a6789ff9de5cb1b8637ab45a4e)
---
 eclass/qt5-build.eclass | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'eclass/qt5-build.eclass')

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 927ca1516b1d..11aeb8c249e8 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -131,20 +131,19 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	local gcc_version_check_fatal=false
 	local min_gcc4_minor_version=5
-	if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-		gcc_version_check_fatal=true
-	fi
 	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 ${gcc_version_check_fatal}; then
-			die "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+		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
 
-- 
cgit v1.2.3-65-gdbad