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 CD8EE1382DE for ; Sat, 2 Jul 2016 21:16:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBCFE1400F; Sat, 2 Jul 2016 21:16:08 +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 D6E591400F for ; Sat, 2 Jul 2016 21:16:07 +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 CF021340DDA for ; Sat, 2 Jul 2016 21:16:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F59F243F for ; Sat, 2 Jul 2016 21:16:02 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1467494152.2ed0f7a6012687058661e1cb93b51bb599719b98.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-5.1.9999.ebuild app-office/libreoffice/libreoffice-5.2.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 2ed0f7a6012687058661e1cb93b51bb599719b98 X-VCS-Branch: master Date: Sat, 2 Jul 2016 21:16:02 +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: b95a1e22-8077-4de8-927f-a977e8b858f3 X-Archives-Hash: 24b3ba08d483e520e6a00752de86d016 commit: 2ed0f7a6012687058661e1cb93b51bb599719b98 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Jun 7 23:43:33 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Jul 2 21:15:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed0f7a6 app-office/libreoffice: Exclude clang from GCC version check Gentoo-bug: 460902 Package-Manager: portage-2.2.28 app-office/libreoffice/libreoffice-5.1.9999.ebuild | 7 ++++--- app-office/libreoffice/libreoffice-5.2.9999.ebuild | 7 ++++--- app-office/libreoffice/libreoffice-9999.ebuild | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild index 26d1209..5320fe3 100644 --- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild @@ -260,9 +260,10 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if [[ $(gcc-major-version) -lt 4 ]] || { - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } - then + if [[ $(tc-getCC) == clang ]] ; then + : # ignore clang, which works + elif [[ $(gcc-major-version) -lt 4 ]] || { + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." fi diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild index 4792129..9b090c0 100644 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild @@ -258,9 +258,10 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if [[ $(gcc-major-version) -lt 4 ]] || { - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } - then + if [[ $(tc-getCC) == clang ]] ; then + : # ignore clang, which works + elif [[ $(gcc-major-version) -lt 4 ]] || { + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." fi diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 4792129..9b090c0 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -258,9 +258,10 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if [[ $(gcc-major-version) -lt 4 ]] || { - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } - then + if [[ $(tc-getCC) == clang ]] ; then + : # ignore clang, which works + elif [[ $(gcc-major-version) -lt 4 ]] || { + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." fi