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 B576E58974 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 69A6321C00D; 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 B16E921C00D 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 6E1AC340A15 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 6227C1021 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: <1453512691.8ed3b65dd6316568c74cad5485936abd7f4f36a4.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: 8ed3b65dd6316568c74cad5485936abd7f4f36a4 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: ba811aeb-b3a1-4198-9e1a-1ea3f6a614ae X-Archives-Hash: 8b2d0a53e0c4c853028ad9901e0b2f99 commit: 8ed3b65dd6316568c74cad5485936abd7f4f36a4 Author: Davide Pesavento gentoo org> AuthorDate: Sat Jan 23 01:31:31 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Jan 23 01:31:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8ed3b65d qt5-build.eclass: update gcc version check for 5.7 and qtwebengine 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 600f2f9..a1ad3fb 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -133,9 +133,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