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 B315859CA3 for ; Sun, 13 Mar 2016 01:27:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A151021C11A; Sun, 13 Mar 2016 01:27:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0610621C117 for ; Sun, 13 Mar 2016 01:27:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 265F0340AA7 for ; Sun, 13 Mar 2016 01:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B48C62098 for ; Sun, 13 Mar 2016 01:27:29 +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: <1457831692.e2c27b48a98cb8a6789ff9de5cb1b8637ab45a4e.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: e2c27b48a98cb8a6789ff9de5cb1b8637ab45a4e X-VCS-Branch: master Date: Sun, 13 Mar 2016 01:27:29 +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: 436500c5-f282-4360-82f6-0c97df775fc2 X-Archives-Hash: 0fa97783d907c75767c6c735fc8a1d33 commit: e2c27b48a98cb8a6789ff9de5cb1b8637ab45a4e Author: Davide Pesavento gentoo org> AuthorDate: Sun Mar 13 01:14:52 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Mar 13 01:14:52 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e2c27b48 qt5-build.eclass: simplify gcc version check, add eerror eclass/qt5-build.eclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index d7be3d0..3bae89c 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -136,20 +136,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