From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD1D11382F6 for ; Thu, 7 Jul 2016 21:45:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDCF6141B2; Thu, 7 Jul 2016 21:45:24 +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 91BB6141B2 for ; Thu, 7 Jul 2016 21:45:24 +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 2045A340BFD for ; Thu, 7 Jul 2016 21:45:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D74362098 for ; Thu, 7 Jul 2016 21:45:21 +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: <1467927876.61f4607ed8d02e97d3250fc86a29d94a3bca7cdd.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: 61f4607ed8d02e97d3250fc86a29d94a3bca7cdd X-VCS-Branch: master Date: Thu, 7 Jul 2016 21:45:21 +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: ae78ec71-1e69-4f6e-a486-7f2e4e067130 X-Archives-Hash: 53ec6290afe698ab3716116368e0aa70 commit: 61f4607ed8d02e97d3250fc86a29d94a3bca7cdd Author: Davide Pesavento gentoo org> AuthorDate: Thu Jul 7 21:44:36 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jul 7 21:44:36 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=61f4607e qt5-build.eclass: don't run gcc version checks if compiler is not gcc Gentoo-Bug: 587582 eclass/qt5-build.eclass | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 5c3acd8..f9de34e 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -136,19 +136,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr # @DESCRIPTION: # Unpacks the sources. qt5-build_src_unpack() { - 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 - 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 + if tc-is-gcc; 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 + 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 fi