commit: d9ced355d625d4580249d197f187972f5267c671 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sat Apr 23 17:55:08 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Apr 23 18:33:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ced355
dev-util/intel-graphics-compiler: drop 1.0.10713-r1, 1.0.10840-r1 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-util/intel-graphics-compiler/Manifest | 2 - ...713-allow-external-spirv-tools-fix-static.patch | 23 ------ .../intel-graphics-compiler-1.0.10713-r1.ebuild | 88 ---------------------- .../intel-graphics-compiler-1.0.10840-r1.ebuild | 87 --------------------- 4 files changed, 200 deletions(-) diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index a23347d60dbd..6be5111d94d1 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,4 +1,2 @@ -DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 063b938ae6d32f3a64decf943215c54ea45eafdb828fdec467941f9e4288977332a3e5e0703193c95412c287f20944b5c2951310c6eb678233cd16dfdd3377b0 SHA512 a6c568d339c0316400f88e318a290a92f842eeb2ab92abd0c23ff155e6b90e2d8e012ac8714a9695a66a509ffef66574919d92bc03ff06b773a79896546fe1a6 DIST intel-graphics-compiler-1.0.10778.tar.gz 8515512 BLAKE2B 56d7a0b54ce026d93179737fe199d006923398b7f85d582487469f1cfa665ae5351bc160c6babda5d8bf2bf6173a051277b2fb11c9ccf4b888cd0e06295161c4 SHA512 e8fcdab3a8c70f8560f49288db42a926f1e8e82d3e433bb897fcd1648acdf0f8fe425a1cd8dae5bfabc7d0a91fe0c985550e35c6396fe46778091852e185e750 -DIST intel-graphics-compiler-1.0.10840.tar.gz 8526951 BLAKE2B 08497e7c3259f33cb5dbdc43a0554f7f83173f43e2d39249d3845e6a4592035c085242d6534719dbb15f14351e301344598618790232db43ea3cee6fa2b7c5af SHA512 268b118732a6e5828a13eddc396b38aef5e7b746f8db0786dce76323fadcfe2a64b0bac87b6557c5bb7ddb000ec31e08f7b2557acfa612d960516e93cec78c81 DIST intel-graphics-compiler-1.0.10988.tar.gz 8571350 BLAKE2B 8f1fcba9016eb607de4604b152e559cae8547c99a618dfc533591165c2da95b466227b75c4ef2b2e9064ec0a30fac711176a7f46f2952df51c06e172fcdcffe4 SHA512 b4de7dc195ee089321a28a428e7604f187552ca161bd08ef245f61740f2ee91e8d48d0718dac17641368113cd8e92ec177a994622f3539dd307542e9dabf5663 diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch deleted file mode 100644 index 6abfdfe60d53..000000000000 --- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 7e6b78d1ccf5afb4080795aa87029e55b9e5499c Mon Sep 17 00:00:00 2001 -From: Andrey Agrachev <[email protected]> -Date: Thu, 10 Mar 2022 12:51:37 +0000 -Subject: [PATCH] Remove 'static' suffix - -Remove 'static' suffix to enable shared lib usage ---- - external/SPIRV-Tools/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt -index f46a6988683..f40605c4b36 100644 ---- a/external/SPIRV-Tools/CMakeLists.txt -+++ b/external/SPIRV-Tools/CMakeLists.txt -@@ -34,7 +34,7 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME) - - set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}") - set_target_properties(SPIRV-Tools-static PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}") -- set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-static) -+ set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools) - - else() #By default use build from sources - message(STATUS "[SPIRV-Tools] : IGC_OPTION__SPIRV_TOOLS_MODE set to Source") diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild deleted file mode 100644 index 1bd12b64e774..000000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="13" -MY_PN="igc" -MY_P="${MY_PN}-${PV}" -PYTHON_COMPAT=( python3_{8..10} ) - -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" - -DEPEND=" - dev-libs/opencl-clang:${LLVM_MAX_SLOT}= - dev-util/spirv-tools - =sys-devel/lld-${LLVM_MAX_SLOT}* - sys-devel/llvm:${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.10713-allow-external-spirv-tools-fix-static.patch" - "${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-last-fix.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})" - - # See https://github.com/intel/intel-graphics-compiler/issues/212 - append-ldflags -Wl,-z,undefs - - # See https://bugs.gentoo.org/718824 - ! use debug && append-cppflags -DNDEBUG - - local mycmakeargs=( - -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}" - -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)" - -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" - -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON" - -DINSTALL_GENX_IR="ON" - -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib" - - # Compilation with VectorCompiler causes currently a segfault. - # See https://github.com/intel/intel-graphics-compiler/issues/236 - -DIGC_BUILD__VC_ENABLED="OFF" - # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds" - - # This will suspress some CMake warnings, - # which cannot be fixed at the moment. - -Wno-dev - ) - - cmake_src_configure -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild deleted file mode 100644 index 7934a1f20302..000000000000 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -LLVM_MAX_SLOT="13" -MY_PN="igc" -MY_P="${MY_PN}-${PV}" -PYTHON_COMPAT=( python3_{8..10} ) - -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" - -DEPEND=" - dev-libs/opencl-clang:${LLVM_MAX_SLOT}= - dev-util/spirv-tools - =sys-devel/lld-${LLVM_MAX_SLOT}* - sys-devel/llvm:${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.10713-allow-external-spirv-tools-last-fix.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})" - - # See https://github.com/intel/intel-graphics-compiler/issues/212 - append-ldflags -Wl,-z,undefs - - # See https://bugs.gentoo.org/718824 - ! use debug && append-cppflags -DNDEBUG - - local mycmakeargs=( - -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}" - -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)" - -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" - -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON" - -DINSTALL_GENX_IR="ON" - -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib" - - # Compilation with VectorCompiler causes currently a segfault. - # See https://github.com/intel/intel-graphics-compiler/issues/236 - -DIGC_BUILD__VC_ENABLED="OFF" - # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds" - - # This will suspress some CMake warnings, - # which cannot be fixed at the moment. - -Wno-dev - ) - - cmake_src_configure -}
