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 445CC58973 for ; Tue, 2 Feb 2016 18:35:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8DF121C117; Tue, 2 Feb 2016 18:35:34 +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 5709921C110 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 08C60340E29 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 8DD1C102D 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: <1454438111.97690bdef2799734a6a8bae0fbcd48cf5381a548.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: 97690bdef2799734a6a8bae0fbcd48cf5381a548 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: 5ee65af4-ece5-4738-bcb4-61d992f61575 X-Archives-Hash: 026fc6726a1e4761656351be14bf77f0 commit: 97690bdef2799734a6a8bae0fbcd48cf5381a548 Author: Davide Pesavento gentoo org> AuthorDate: Sat Jan 23 01:31:31 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Feb 2 18:35:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97690bde qt5-build.eclass: update gcc version check for 5.7 and qtwebengine (cherry picked from proj/qt commit 8ed3b65dd6316568c74cad5485936abd7f4f36a4) 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 f71a35e..1830d21 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -127,9 +127,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