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 6288558973 for ; Tue, 2 Feb 2016 18:35:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2D0A21C11A; Tue, 2 Feb 2016 18:35:38 +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 5F28B21C11A for ; Tue, 2 Feb 2016 18:35:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 128A0340E35 for ; Tue, 2 Feb 2016 18:35:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0332102F for ; Tue, 2 Feb 2016 18:35:28 +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: <1454438113.f122552ab4fc6969c50c0d30dcff045919626dac.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: f122552ab4fc6969c50c0d30dcff045919626dac X-VCS-Branch: master Date: Tue, 2 Feb 2016 18:35:28 +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: 6f7c857e-5bd8-4a7a-8363-d8c2ecce1a91 X-Archives-Hash: cc0dad32fe4abe4ca228d1e87c729887 commit: f122552ab4fc6969c50c0d30dcff045919626dac Author: Davide Pesavento gentoo org> AuthorDate: Sat Jan 23 02:02:29 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Feb 2 18:35:13 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f122552a qt5-build.eclass: make gcc version check fatal starting with Qt 5.6 (cherry picked from proj/qt commit 91839540e97eb22f0ac218aa174b06a01870f3f5) 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 1830d21..ac9dfc8 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -127,15 +127,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