gentoo resync : 12.05.2022

7 files changed, 38 insertions, 98 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 87ffdb1368e0..1e74002d5e9d 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,15 +1,13 @@
-AUX intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch 1053 BLAKE2B cd80e25933cf68cae65a94359c54ee1d2ae0fdd5f8a6fd5377b4e5d28820b3fe16b2193e0ad6a858c3eb0ea609f7e1a0fdd566ac26a5badbdc2b5b30ea651bff SHA512 4274e0f3aac3a89d434f88fba80561a54c5d438fe1a9a005c0434b66082edde82256d5522f723ed8e32df5892c44f4602df9106295a58c5e37b6fd825c00e16f
 AUX intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch 2196 BLAKE2B ffa4bdf3c5a4d0a66b44a08b4fdea40d768a50810d9d21aecde75807d3d79486c9676ac8d12ebdcffdc6cf13c09a9f2af426da67ca2859f949cd06ddc0f019ed SHA512 62d4cb388982f9f16bf073648b3776f0bb27025e1b36dabe4b2076eb50640d3a16709f510cd34d3da67ecca790c2fc6d286878702540a109f889751096ec9a10
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
-AUX intel-graphics-compiler-1.0.8365-cmake-project.patch 774 BLAKE2B 7b117f1acecf2aca35e8ef46725da4e1f4b077e87b06bd99b64504cfb21b2834dc921bbe7cfaebd34ebf864a85506859b3689d5cae76e6506c4d96e4304735dc SHA512 23c754019408cb12e9341545a627847db853c92618c58fba87b295fb4430d077154f20e241f692354dee50e624f008e8b765c60e17339988c04c583f4636a56f
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-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.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
-EBUILD intel-graphics-compiler-1.0.10713-r1.ebuild 2563 BLAKE2B 140fc5a13dca0f1db2319654408ed9c85cb0715ff6eeaffd2912af41a643f6c1f002a543b5612afdd9820f8c3098def091b2b7d368ae91507e773eb030f2f1a8 SHA512 8a880b9543accfdb14626bdc46fc6439b6566cc5b5e5ac05e511a48d81c2ad7faec3bdefba04c89e7d5177f8df6a8b47769326c0331e39693477b1894154d4d9
-EBUILD intel-graphics-compiler-1.0.10778-r1.ebuild 2488 BLAKE2B 1244c1cce52c3b1b1ccc4ba1281e1e5d558f0fdc1290d396d539fb866619683af76aea0f79834da09f8cdb19b76447cf867023a81f549b9fccb584e099815b02 SHA512 9cae6ca91189253ac4ccd7635d3fdf9ec43a3e7463707b9757c15d897e923a749c8b7394a9f8c837912817a8c7a69114145519482328bf4ee9106c6e95e7d847
-EBUILD intel-graphics-compiler-1.0.10840-r1.ebuild 2488 BLAKE2B 1244c1cce52c3b1b1ccc4ba1281e1e5d558f0fdc1290d396d539fb866619683af76aea0f79834da09f8cdb19b76447cf867023a81f549b9fccb584e099815b02 SHA512 9cae6ca91189253ac4ccd7635d3fdf9ec43a3e7463707b9757c15d897e923a749c8b7394a9f8c837912817a8c7a69114145519482328bf4ee9106c6e95e7d847
-EBUILD intel-graphics-compiler-1.0.8744.ebuild 2150 BLAKE2B 217fa07639962ee989287889658a1816c9a21237f862fa0a40f0d96c149769c6c778c798b95ef4e2dfef31dede8bfa0b17723b69b3f96fae5f654cad026b5256 SHA512 35be130f95ef04a171293c885c9c3d7df549cbfd21e28f454d0dc4fa3c575e8a40c91988cd2e9a70ac6df05facc44bda036828154014fb00fbb64c4e29e9c1f4
+DIST intel-graphics-compiler-1.0.10988.tar.gz 8571350 BLAKE2B 8f1fcba9016eb607de4604b152e559cae8547c99a618dfc533591165c2da95b466227b75c4ef2b2e9064ec0a30fac711176a7f46f2952df51c06e172fcdcffe4 SHA512 b4de7dc195ee089321a28a428e7604f187552ca161bd08ef245f61740f2ee91e8d48d0718dac17641368113cd8e92ec177a994622f3539dd307542e9dabf5663
+DIST intel-graphics-compiler-1.0.11061.tar.gz 8586132 BLAKE2B e8d97622c353e997acea1b9bed34423aaf0044a10d2effbe2c4b146ced1388ca5cf72ff1716e69d378625d674c09e84e7864b6817a0dfd0ba05a29de9f1aca6c SHA512 eb1688ff42c154267b82ffcc9fc58e587d7d52a8157cc8ca692e4d726eb62830fd3812bf391552d43e1d0c17c1ed59a6c3c206a35324c05a12ed943113f1a9d8
+DIST intel-graphics-compiler-1.0.11104.tar.gz 8594329 BLAKE2B 15beca4428816686f29ea14c41c55b4ecd9be094f9dd3c004b6b7a521526205d45f7ccae93f32125b4cde16e863dd5b1d832cadab4bf4500b468900ddcae230e SHA512 9c52cde409168c36ac3744a0cf825f10ce59538eac804721dcb23d72ad7a752e587798b55c4da23edc2b7e0a00376ef29ab39ca485de2ab179f04c5b5bc9a8ad
+EBUILD intel-graphics-compiler-1.0.10778-r2.ebuild 2401 BLAKE2B 5cd251772041ae6ebd18b806ff9469d4e28590da6c3cd31ddf633d8c5b845e09d8829599e1f70049d94fce9a87905718f2977846de9941327d98e877c97c6b1b SHA512 932d954f42703a2b79bbf4f9aa995f8d0f816d3014229d93b4e7a9b4ac24c91f92aa31e6230b9d3d6fa00ea7a0b996d898536a3b95e762f466e052430beb3bdc
+EBUILD intel-graphics-compiler-1.0.10988-r1.ebuild 2329 BLAKE2B 8c5e2713ad095d4c06d2df3947ecf0aa35dfc9cdfb4384ccd40bd8704c6031d15ab56ae7f9410e1f35124964fc9a4e79f479349b0a29f213dfe6607e10d2ca5d SHA512 55ba397dfd2f8663aad30836a82331f95863f3c6e047a350af888f4c9dc9ab4a75ccf66ea082169503e31b889a519e035b45cfc70a198077710ca7e6a4c9898d
+EBUILD intel-graphics-compiler-1.0.11061-r1.ebuild 2329 BLAKE2B 8c5e2713ad095d4c06d2df3947ecf0aa35dfc9cdfb4384ccd40bd8704c6031d15ab56ae7f9410e1f35124964fc9a4e79f479349b0a29f213dfe6607e10d2ca5d SHA512 55ba397dfd2f8663aad30836a82331f95863f3c6e047a350af888f4c9dc9ab4a75ccf66ea082169503e31b889a519e035b45cfc70a198077710ca7e6a4c9898d
+EBUILD intel-graphics-compiler-1.0.11104.ebuild 2329 BLAKE2B 8c5e2713ad095d4c06d2df3947ecf0aa35dfc9cdfb4384ccd40bd8704c6031d15ab56ae7f9410e1f35124964fc9a4e79f479349b0a29f213dfe6607e10d2ca5d SHA512 55ba397dfd2f8663aad30836a82331f95863f3c6e047a350af888f4c9dc9ab4a75ccf66ea082169503e31b889a519e035b45cfc70a198077710ca7e6a4c9898d
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
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 <andrey.agrachev@intel.com>
-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/files/intel-graphics-compiler-1.0.8365-cmake-project.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
deleted file mode 100644
index 92683cdfb942..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f883dc94360af37ce85c8a9215c861fdc0431dee Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sat, 28 Aug 2021 00:09:09 +0200
-Subject: [PATCH] IGC: CMakeLists: add project
-
-If project is not added, CMake will warn about it:
-No project() command is present. The top-level CMakeLists.txt file
-must contain a literal, direct call to the project() command.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bfbcf52eca4..5b04555b21f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,8 @@
- 
- cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
- 
-+project(IGC)
-+
- add_subdirectory(IGC)
- 
- list(APPEND IGC__IGC_TARGETS "igc_dll")
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.10778-r2.ebuild
index 7934a1f20302..6c079df6172d 100644
--- 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.10778-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="12"
 MY_PN="igc"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 DEPEND="
@@ -72,15 +72,12 @@ src_configure() {
 		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
 		-DINSTALL_GENX_IR="ON"
 		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
 
 		# 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.10778-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild
index 7934a1f20302..e6c00047ccc6 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="12"
 MY_PN="igc"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -39,7 +39,6 @@ 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() {
@@ -72,15 +71,12 @@ src_configure() {
 		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
 		-DINSTALL_GENX_IR="ON"
 		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
 
 		# 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.10713-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11061-r1.ebuild
index 1bd12b64e774..e6c00047ccc6 100644
--- 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.11061-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="12"
 MY_PN="igc"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -39,8 +39,6 @@ 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() {
@@ -73,15 +71,12 @@ src_configure() {
 		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
 		-DINSTALL_GENX_IR="ON"
 		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
 
 		# 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.8744.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11104.ebuild
index 21d5303b49fa..e6c00047ccc6 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11104.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="11"
+LLVM_MAX_SLOT="12"
 MY_PN="igc"
 MY_P="${MY_PN}-${PV}"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -18,26 +18,27 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+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}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}
 "
 
 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.8365-cmake-project.patch"
 )
 
 pkg_setup() {
@@ -46,33 +47,36 @@ 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.
-	# See bug #718824 for more information.
-	! use debug && append-cppflags -DNDEBUG
-
 	# 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=(
-		# Those options are ensuring, that we are using
-		# the system LLVM with the correct slot.
 		-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##*-}"
-
-		# VectorCompiler needs work, as at the moment upstream
-		# only supports building vc-intrinsics in place.
-		-DIGC_BUILD__VC_ENABLED="NO"
-
-		# This will suspress some CMake warnings,
-		# which cannot be fixed at the moment.
+		-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"
 		-Wno-dev
+
+		# 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"
 	)
 
 	cmake_src_configure