gentoo (valentine's day) resync : 14.02.2021

2 files changed, 73 insertions, 0 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 3ee576e800ad..fbc1494338c8 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -2,6 +2,8 @@ AUX intel-graphics-compiler-1.0.4111-opencl-clang_version.patch 1567 BLAKE2B cef
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
 DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105 SHA512 34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
+DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1 SHA512 e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80
 EBUILD intel-graphics-compiler-1.0.4111.ebuild 1948 BLAKE2B b94c41a2657cb985065ef195ae06d62d53db8a02d30f48fdd37014b8209382d459cec5da6bfc4f1a2ded793a60adf736ea4d43f6511aecde9614c2b6aac42c49 SHA512 0abfecf61f289b258909da53e3edae8eea31577a3b57108043b7e8d6902d53153d55d8f635bc3146e71e986e9f12bfebf280ead5f58196e3f36abaeeda7411a0
 EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785
+EBUILD intel-graphics-compiler-1.0.5353.ebuild 2471 BLAKE2B c8874af4a5ba31cc8d977b52a8d2c2a41f0c9ba8957b900bbaafe3e4474a4cac42d1713f2797edaa0ccfaf02b6a35f1f075e80138171339ed9deb784e54a820f SHA512 1ae9e4cbee369646bfa05626e5358a1540b9fbbfc09c55c464f2822abfa7477e688b299bcea224c7796bee175a3d2f71d354e2d4e2f5f7ad91b03b1206a7c966
 MISC metadata.xml 262 BLAKE2B 6c3ab6eb29647b8d630b1421eca7289613438d56dfa180f85efefbb922d8d2772a26ac2360715dbce23f5b5acff73ccc5cf8d85c90a666c0475f232ed1a6a2ad SHA512 58cf8c27cd031f7653e54b8187dd99b885b5ff336c8db4692a9ee64ecbc6f503d2c41921410114d30c1ec49da925bfc67f5f7da61dd6f89a0257eb1f35c9b6ec
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
new file mode 100644
index 000000000000..3945893333cb
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+LLVM_MAX_SLOT=11
+
+# Yes, the last dependency does effectively force the use of llvm-10
+# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
+# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
+# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
+DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+	>=dev-libs/opencl-clang-11.0.0:=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+	"${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
+)
+#	"${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+find_best_llvm_slot() {
+	local candidate_slot
+
+	# Select the same slot as the best opencl-clang
+	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+	einfo "Selecting ${ocl_clang_ver}"
+	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
+
+	# Sanity check - opencl-clang brings the right LLVM slot as its
+	# dependency so if this is missing, something is very wrong.
+	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
+
+	echo ${candidate_slot}
+}
+
+multilib_src_configure() {
+	local llvm_slot=$(find_best_llvm_slot)
+	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
+	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
+
+	# 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).
+	use debug || append-cppflags -DNDEBUG
+
+	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION=${llvm_slot}
+		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
+		-DIGC_BUILD__VC_ENABLED=no
+	)
+	cmake_src_configure
+}