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 AC416158013 for ; Sat, 28 Aug 2021 12:25:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6543E0844; Sat, 28 Aug 2021 12:25:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 82615E0844 for ; Sat, 28 Aug 2021 12:25:46 +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 CB0D9335DA6 for ; Sat, 28 Aug 2021 12:25:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BECA74E for ; Sat, 28 Aug 2021 12:25:42 +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: <1630153517.b37cf38b6051bd3148a7de55981ec84afd096ccb.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.8365-r1.ebuild X-VCS-Directories: dev-util/intel-graphics-compiler/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: b37cf38b6051bd3148a7de55981ec84afd096ccb X-VCS-Branch: master Date: Sat, 28 Aug 2021 12:25:42 +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: 21ebf8b8-d8c7-4792-b83b-7b504bc0db56 X-Archives-Hash: 5861f51b323c59d8dc082423c931a50b commit: b37cf38b6051bd3148a7de55981ec84afd096ccb Author: Conrad Kostecki gentoo org> AuthorDate: Sat Aug 28 12:10:21 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Aug 28 12:25:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37cf38b dev-util/intel-graphics-compiler: fix python handling Closes: https://bugs.gentoo.org/810754 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Conrad Kostecki gentoo.org> .../intel-graphics-compiler-1.0.8365-r1.ebuild | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild index c883ba1d6b6..5f73442c79b 100644 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild @@ -7,8 +7,9 @@ CMAKE_BUILD_TYPE="Release" LLVM_MAX_SLOT="10" MY_PN="igc" MY_P="${MY_PN}-${PV}" +PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake flag-o-matic llvm +inherit cmake flag-o-matic llvm python-any-r1 DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware" HOMEPAGE="https://github.com/intel/intel-graphics-compiler" @@ -27,7 +28,10 @@ DEPEND=" RDEPEND="${DEPEND}" -BDEPEND=">=sys-devel/lld-${LLVM_MAX_SLOT}" +BDEPEND=" + ${PYTHON_DEPS} + >=sys-devel/lld-${LLVM_MAX_SLOT} +" PATCHES=( "${FILESDIR}/${PN}-1.0.9-no_Werror.patch" @@ -38,6 +42,11 @@ PATCHES=( "${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch" ) +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + src_configure() { # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, # and the way IGC uses this definition causes problems for some users. @@ -52,10 +61,9 @@ src_configure() { -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64" -DIGC_OPTION__CLANG_MODE="Prebuilds" -DIGC_OPTION__LLD_MODE="Prebuilds" + -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common" -DIGC_OPTION__LLVM_MODE="Prebuilds" -DIGC_OPTION__LLVM_PREFERRED_VERSION="${LLVM_MAX_SLOT}" - -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds" - -DIGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_VC="ON" # VectorCompiler needs work, as at the moment upstream # only supports building vc-intrinsics in place.