gentoo resync : 16.04.2022

4 files changed, 95 insertions, 4 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 07606d1fbde0..87ffdb1368e0 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -6,8 +6,10 @@ AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c
 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.ebuild 2529 BLAKE2B 1f3dc2f992387aa44093a630cc1c318873b946fcfb8df7bd9e933801fc402be926743cff604fd4b78e40f829ade9ad7b13810e084fed30e3b391d32f33f4c411 SHA512 d7f0e579756040368ea7c870761a304f3b9a89fe4cabfa61b1b1d88669aa17687938fac8aa689259a1b201ead85090f44b16485ff6c37d83db29bd46809f2744
-EBUILD intel-graphics-compiler-1.0.10778.ebuild 2454 BLAKE2B 0ad651fc0267ae6f778ba3eabe472587d5fa6805e58d80979b867ac2025d73dbc603758c3303db2858e0da3c9a7673d551c8726a2565609b4050b0e6bed6c315 SHA512 7b5e16a35e1b56643022f6e674370e897e1981769cbc73a1d92a3d61272b6f9f92323583641dd3ad8137e24c7f2b3526d77830388aa2b035ff0493c00bf879d9
+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
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
index d0d4c3c1272a..1bd12b64e774 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
@@ -24,14 +24,15 @@ 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=(
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
index 1869d0071897..7934a1f20302 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
@@ -24,14 +24,15 @@ 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=(
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
new file mode 100644
index 000000000000..7934a1f20302
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
@@ -0,0 +1,87 @@
+# 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
+}