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 7DE591382C5 for ; Sun, 4 Apr 2021 12:56:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB90EE08C8; Sun, 4 Apr 2021 12:56:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9C0CCE08C8 for ; Sun, 4 Apr 2021 12:56:27 +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 4A75B335C7D for ; Sun, 4 Apr 2021 12:56:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81DF447 for ; Sun, 4 Apr 2021 12:56:24 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1617540106.cab5c607434d7c7c7b01987a0f9b7f1220d39eb3.conikost@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.5353.ebuild X-VCS-Directories: dev-util/intel-graphics-compiler/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: cab5c607434d7c7c7b01987a0f9b7f1220d39eb3 X-VCS-Branch: master Date: Sun, 4 Apr 2021 12:56:24 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd9f3dce-64cb-4b63-9d82-ba7a103a8a79 X-Archives-Hash: aa7ae1af0936e05fd301a94a9689e386 commit: cab5c607434d7c7c7b01987a0f9b7f1220d39eb3 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Apr 4 12:31:14 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Apr 4 12:41:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab5c607 dev-util/intel-graphics-compiler: fix compilation Closes: https://bugs.gentoo.org/779661 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> .../intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild index 3945893333c..0173f758337 100644 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild @@ -54,6 +54,8 @@ multilib_src_configure() { local llvm_slot=$(find_best_llvm_slot) einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})" local llvm_prefix=$(get_llvm_prefix ${llvm_slot}) + local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot}) + llvm_ver=${llvm_ver##*-} # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way # IGC uses this definition causes problems for some users (see Bug #718824). @@ -64,7 +66,7 @@ multilib_src_configure() { -DCCLANG_SONAME_VERSION=${llvm_slot} -DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir) -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON - -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot} + -DIGC_PREFERRED_LLVM_VERSION=${llvm_ver} -DIGC_BUILD__VC_ENABLED=no ) cmake_src_configure