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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 770AE15ACFB for ; Sun, 9 Apr 2023 19:35:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5EBAE0867; Sun, 9 Apr 2023 19:35:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87098E0867 for ; Sun, 9 Apr 2023 19:35:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1149340CAC for ; Sun, 9 Apr 2023 19:35:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 644B1A40 for ; Sun, 9 Apr 2023 19:35:07 +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: <1681068897.d0733ed0854e86c1eb51524b4f833c130ce36dc4.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/intel-graphics-compiler/Manifest dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild X-VCS-Directories: dev-util/intel-graphics-compiler/ dev-util/intel-graphics-compiler/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: d0733ed0854e86c1eb51524b4f833c130ce36dc4 X-VCS-Branch: master Date: Sun, 9 Apr 2023 19:35:07 +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: 87e0802d-3179-4f4b-a315-13cb7380b93b X-Archives-Hash: 49da621b620c6e13b60dd4b46d0c5cb9 commit: d0733ed0854e86c1eb51524b4f833c130ce36dc4 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Apr 9 19:25:46 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Apr 9 19:34:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0733ed0 dev-util/intel-graphics-compiler: drop 1.0.13230.7-r1 Signed-off-by: Conrad Kostecki gentoo.org> dev-util/intel-graphics-compiler/Manifest | 1 - ...phics-compiler-1.0.11485-include-opencl-c.patch | 11 --- ...graphics-compiler-1.0.13230.7-spirv-tools.patch | 26 ------- .../intel-graphics-compiler-1.0.13230.7-r1.ebuild | 90 ---------------------- 4 files changed, 128 deletions(-) diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index 4883c6acad77..f32bfe6db88d 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,2 +1 @@ -DIST intel-graphics-compiler-1.0.13230.7.tar.gz 8813719 BLAKE2B 5cc6ef816b030d786dfcf6296b39f6c2bfcc9db4c4a12db84456a508bd7d8998d4dfc9e6993e05167a3f797287176dda31e5fd43bbc3284fa26d4c8ca89f6164 SHA512 774f62ff8f5b7bd95fd766c88bc62ff66498c23d020dbfdfd18734e532e7d701652325cb7aca00f7ab3cfdd051d37e56939d7978db127e9044cd5b6c077979ac DIST intel-graphics-compiler-1.0.13463.1.tar.gz 8283903 BLAKE2B abe9f2a8cc0c648d985890d65782db2df61966d25b740ee735b0198cee701e79fcd33267b8284002f049cc2582db13c3b33481131570c0d69435a3dc4ada64d4 SHA512 3edafc7cadb946b62b5afa44bf81663c83ad6eab15c2825b60cfb5120da94d66898d3f073af13a747cdf2db586085de14ee75fcdda0e16a1ca7197d5645fe1a9 diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch deleted file mode 100644 index dbf4188ad0bc..000000000000 --- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/IGC/cmake/igc_find_opencl_clang.cmake -+++ b/IGC/cmake/igc_find_opencl_clang.cmake -@@ -104,7 +104,7 @@ - - # Get parent dir of the location of CLANG_EXE - get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY) -- file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h) -+ file(GLOB_RECURSE opencl-header ${CCLANG_INCLUDE_PREBUILDS_DIR}/*opencl-c.h) - if(opencl-header) - message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}") - else(opencl-header) diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch deleted file mode 100644 index d33f9eb2021f..000000000000 --- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8068732355d18464a9fcb6846c225929349b450c Mon Sep 17 00:00:00 2001 -From: Jakub Czarnecki -Date: Thu, 26 Jan 2023 11:35:03 +0000 -Subject: [PATCH] Preinstalled SPIRV-Tools CMakeFile - target fix - -Added checking if SPIRV-Tools isn't already set as target before adding -it as a custom target to avoid errors. ---- - external/SPIRV-Tools/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt -index 9afa5746c4d..3b768c1b772 100644 ---- a/external/SPIRV-Tools/CMakeLists.txt -+++ b/external/SPIRV-Tools/CMakeLists.txt -@@ -33,7 +33,9 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME) - set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}") - - set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}") -- add_custom_target(SPIRV-Tools) -+ if(NOT TARGET SPIRV-Tools) -+ add_custom_target(SPIRV-Tools) -+ endif() - set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}") - set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools) - diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild deleted file mode 100644 index 2dd387059629..000000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="14" -MY_PN="igc" -MY_P="${MY_PN}-${PV}" -PYTHON_COMPAT=( python3_{9..11} ) - -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" -SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="debug vc" - -DEPEND=" - dev-libs/opencl-clang:${LLVM_MAX_SLOT}= - dev-util/spirv-tools - sys-devel/lld:${LLVM_MAX_SLOT}= - sys-devel/llvm:${LLVM_MAX_SLOT}= - vc? ( - >=dev-libs/intel-vc-intrinsics-0.11.0 - dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}= - ) -" - -RDEPEND="${DEPEND}" - -BDEPEND=" - =sys-devel/lld-${LLVM_MAX_SLOT}* - ${PYTHON_DEPS} -" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.9-no_Werror.patch" - "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch" - "${FILESDIR}/${PN}-1.0.8365-disable-git.patch" - "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch" - "${FILESDIR}/${PN}-1.0.13230.7-spirv-tools.patch" -) - -pkg_setup() { - llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - # Get LLVM version - local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})" - local llvm_version="${llvm_version%%-r*}" - - # See https://github.com/intel/intel-graphics-compiler/issues/212 - append-ldflags -Wl,-z,undefs - - # See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282 - append-flags -U_GLIBCXX_ASSERTIONS - - # See https://bugs.gentoo.org/718824 - ! use debug && append-cppflags -DNDEBUG - - local mycmakeargs=( - -DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include" - -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}" - -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)" - -DIGC_BUILD__VC_ENABLED="$(usex vc)" - -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64" - -DIGC_OPTION__CLANG_MODE="Prebuilds" - -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON" - -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_version##*-}" - -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds" - -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds" - $(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '') - -DINSTALL_GENX_IR="ON" - -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib" - -Wno-dev - ) - - cmake_src_configure -}