From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1207914-garchives=archives.gentoo.org@lists.gentoo.org>
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 92724138359
	for <garchives@archives.gentoo.org>; Sun, 20 Sep 2020 14:34:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C91A9E08FB;
	Sun, 20 Sep 2020 14:34:10 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AF857E08FB
	for <gentoo-commits@lists.gentoo.org>; Sun, 20 Sep 2020 14:34:10 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id BC8A5340F50
	for <gentoo-commits@lists.gentoo.org>; Sun, 20 Sep 2020 14:34:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 69671365
	for <gentoo-commits@lists.gentoo.org>; Sun, 20 Sep 2020 14:34:08 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1600612439.6cbc8a7b3d4ef1ff93eaedfb2ea1b77acf002ec5.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
X-VCS-Directories: dev-util/intel-graphics-compiler/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 6cbc8a7b3d4ef1ff93eaedfb2ea1b77acf002ec5
X-VCS-Branch: master
Date: Sun, 20 Sep 2020 14:34:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c4faab5d-dd99-40a4-a28a-fa12fd8a16c0
X-Archives-Hash: e31f50465391478151a84857db8ef221

commit:     6cbc8a7b3d4ef1ff93eaedfb2ea1b77acf002ec5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 14:25:32 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:33:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbc8a7b

dev-util/intel-graphics-compiler-1.0.4111: only block llvm-10 in TC

Turns out this version is not going anywhere any time soon, in fact
there is a stablereq for it now - so let's handle this properly.
Specifically, pkg_pretend() now dies if the current compiler is
clang-10+ (I think it is safe to assume that if 10 does not work nor
will the newer versions).

Bug: https://bugs.gentoo.org/738934
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../intel-graphics-compiler-1.0.4111.ebuild                  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
index b5113c4912d..4b31c121d43 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
@@ -18,9 +18,7 @@ IUSE="debug"
 
 LLVM_MAX_SLOT=10
 
-# Bug #738934
-#COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-COMMON="<sys-devel/llvm-10.0.1:=[${MULTILIB_USEDEP}]
+COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
 	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}"
 RDEPEND="${COMMON}"
@@ -32,6 +30,14 @@ PATCHES=(
 
 S="${WORKDIR}"/${PN}-igc-${PV}
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if tc-is-clang && [[ $(clang-major-version) -ge 10 ]] ; then
+			die "Building IGC with clang-10 and newer is presently not supported (see Bug #738934). Please use clang-9 or gcc instead."
+		fi
+	fi
+}
+
 multilib_src_configure() {
 	# Select the same slot as the best opencl-clang
 	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"