From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B308658973 for ; Sat, 23 Jan 2016 02:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4559C21C00A; Sat, 23 Jan 2016 02:03:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA35F21C009 for ; Sat, 23 Jan 2016 02:03:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7FAEB340A35 for ; Sat, 23 Jan 2016 02:03:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73F341069 for ; Sat, 23 Jan 2016 02:03:30 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1453514549.91839540e97eb22f0ac218aa174b06a01870f3f5.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 91839540e97eb22f0ac218aa174b06a01870f3f5 X-VCS-Branch: master Date: Sat, 23 Jan 2016 02:03:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4a5cdd78-ceb1-4c0d-8b13-862ebce6186f X-Archives-Hash: f6527da0102f7e038793422bae0b5c82 commit: 91839540e97eb22f0ac218aa174b06a01870f3f5 Author: Davide Pesavento gentoo org> AuthorDate: Sat Jan 23 02:02:29 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Jan 23 02:02:29 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=91839540 qt5-build.eclass: make gcc version check fatal starting with Qt 5.6 eclass/qt5-build.eclass | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index a1ad3fb..72e60e9 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -133,15 +133,21 @@ 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 - ewarn - ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported." - ewarn + if ${gcc_version_check_fatal}; then + die "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" + else + ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported" + fi fi if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then