gentoo auto-resync : 25:02:2024 - 05:40:31

3 files changed, 32 insertions, 2 deletions

diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index fcc6dda3cf75..6335c6a507b9 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,10 +1,11 @@
 AUX spirv-llvm-translator-16.0.0-ld_library_path.patch 2545 BLAKE2B b0a361f430bf7abd3e3cc24a71b7df5a8feda3bfef0b2832462b68c005356c6437c75f0257b66a3add54d3b1999275ff20cedfe9480c0ae63e78d32427c835f5 SHA512 73a134b774ee772f809b55f3369f6007b0fd19c9ddf566e81387fff5b4498c47dc5e3ada6367e2ccf3498346027543034d75977cb78d365d1c99405b9323b4e6
 AUX spirv-llvm-translator-16.0.0-llvm-link-llvm-dylib.patch 1755 BLAKE2B fa0465b04580a68258adc8aa3e73a9d66b75a7c0896e5b646a0e0860400c675a5ea09164d844f72a5a98933095e332c18e480833eb75c76e875f10105ea6dbea SHA512 b5e9a771c1b4b062777f7c7f994224bae54f036c46df0e275d276856d74f778843f6fa1cb77fb714e72b20704d5a22daeb0e83c93fb557d629809eb680f6c3a2
+AUX spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch 1163 BLAKE2B abd9247461c035790c6914c9719a44b30ef54a2d44246c58835af6349176341d1f1500d238163e4fe17406e6e36e701dfccf0d38729b85915c89f0618682e744 SHA512 374e7f701da543091e78027f0e4540e325c45c8b08d6ffeefc53337493aa76444e5b615c033ef198dd9422868ba0d8aec157a5f7b757510d05db02355d5bf15d
 AUX spirv-llvm-translator-17.0.0-intel-capability.patch 9322 BLAKE2B aa847ba0376fd78cd105b6dce4d785cb060f08a04da0ca52a12f689bbbb49b3eaec579669458e70c2b7f75b446752492e07cdc62c39e57e465532ce3f55b0cb4 SHA512 912ed2ffccb033c5bd7790e7d8e2f63437388375c17d8191a1fc4409daba9e2bd9e00ca3232ff4451f58fc430e040d7837f700f844c0a6fb14bfdccd61829a4a
 DIST spirv-llvm-translator-15.0.0.tar.gz 1515145 BLAKE2B 1f93b55f8934ce7dbc9416b82f7bd544d16e95be795047e914d0c303ec90965eae03ab3522b3c92d6cffb1fe00bed78a4bb74085d3da21c14b68ad3fbe53113c SHA512 8a6ddddf326dad96c1c5749ebf03e63e6be60592dccd307f7a35be668cec2b4f58c2f089854aeefa37398c3a97dad6bf92a6ceb892da27b5cf9d4ae1aa41dd06
 DIST spirv-llvm-translator-16.0.0.tar.gz 1542060 BLAKE2B bee72a776062266e60c5237396434ecba4e4da959ed52292ad08388bdd08d7749fd86cfac5c25af424032a1ba19f59b2d8c7eac0eaf50db6a4945841abe0836f SHA512 0bacacb89aa2b03d1173d1bfbcdd83fdce7441ebc3fff65e14dc5e901fc983861365a54c029b2a65075b6fa45046c30aa7bbad4e6150cf3382e7d050c598de98
 DIST spirv-llvm-translator-17.0.0.tar.gz 1601166 BLAKE2B c3e7a78fa55cd13ba61c024e2d3d82c47ac9dbf8c11bcbcf4ddc34a6838fb948885a263fd9af2d0f404b31f4c6e9226c9582e0f65b3220770e1af07cf85f4dac SHA512 ee54e597c678755cb48d677f81184d66616c7be934b570e04f0106e64c15f1cab124177b757f08a7713fa7fce981c74d61304d4554e6d198e6c14c53abf1e81c
 EBUILD spirv-llvm-translator-15.0.0-r1.ebuild 1160 BLAKE2B e743e55a4c13939b57e12e26d4a2dc5ca567f37560ce53283c1f7a032a31bbc8fd9cdc9c70ebad40fcc1fa412d77517ddbe6a9b4ace15a83007d96f1a1aaf051 SHA512 139b3d01c309b89559e416fa3d19926c545023020b2a284e7ba21f87bf1ba1c27dd57df0a05f7d971f33fd2d061914fc9e838cb9edcce54f1574b5b7bd6aecee
 EBUILD spirv-llvm-translator-16.0.0-r1.ebuild 1383 BLAKE2B 3ad35b6f1e9901a4ecbe4d39122c3a1901e7eb966e4352ffb210be7cee0092b9fec6c316aa77b0ad1f0f11110eab5a18b44c6f5dbe326aa161c5e017e5b48af9 SHA512 26e7d4bbaecd64fd6ec86f8eb3813cf538816d38d487c1e4340ea4320f6b89d5cd149f5e88c862095bca27fa08b9aa770c51dc3aa41c6c7239e726617b3b7310
-EBUILD spirv-llvm-translator-17.0.0-r2.ebuild 1295 BLAKE2B f9dfa0c4fbc2407d73045591c5ae8c4c7ea5b26c7c690d24b55870030102d0763e7b3f27a8e02a278c82a785bbad44297d0fbb1190b1246f8eca5b10373babbb SHA512 41f68af82cf4509e1fdb4415806274d7b494e3e3a8f84547e44b9ba2a8171c9287c1a27f978668aeee8321ea3b47499256158d83563f3a6de4b13d84f36aa627
+EBUILD spirv-llvm-translator-17.0.0-r2.ebuild 1367 BLAKE2B ce285b9d601f61b2bae92296034af4dfe125dab590afe8a9a72457e60b0c74d4090573d091c33802d70cabff9d09a3ac7900e0b58c22e9009ba6be4367f857a9 SHA512 32e5dca797162fd29817a207148390fbd9da76fbe0a7aea8bda0e1a14510a2e558c4da5e8763d3b09017e579f3a8066cf7a7b75d8770d508b2d1ce0e9992d947
 MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch
new file mode 100644
index 000000000000..e2a575600c44
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch
@@ -0,0 +1,26 @@
+From 587443c9e9094f37ac4e185fb4f889913c6992a9 Mon Sep 17 00:00:00 2001
+From: Dmitry Sidorov <dmitry.sidorov@intel.com>
+Date: Thu, 26 Oct 2023 04:36:07 -0700
+Subject: [PATCH] do not rely on version of compiler being $VER.0.0 (#2194)
+
+Co-authored-by: Stanley Gambarin <stanley.gambarin@intel.com>
+---
+ test/DebugInfo/NonSemantic/DebugFunction.cl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/DebugInfo/NonSemantic/DebugFunction.cl b/test/DebugInfo/NonSemantic/DebugFunction.cl
+index 43294916..f84b303a 100644
+--- a/test/DebugInfo/NonSemantic/DebugFunction.cl
++++ b/test/DebugInfo/NonSemantic/DebugFunction.cl
+@@ -25,7 +25,7 @@ void kernel k() {
+ // CHECK-SPIRV-DAG: String [[foo:[0-9]+]] "foo"
+ // CHECK-SPIRV-DAG: String [[#EmptyStr:]] ""
+ // CHECK-SPIRV-DAG: String [[k:[0-9]+]] "k"
+-// CHECK-SPIRV-DAG: String [[#CV:]] "{{.*}}clang version [[#]].0.0
++// CHECK-SPIRV-DAG: String [[#CV:]] "{{.*}}clang version [[#]].[[#]].[[#]]
+ // CHECK-SPIRV: [[#CU:]] [[#]] DebugCompilationUnit
+ // CHECK-SPIRV: [[#FuncFoo:]] [[#]] DebugFunction [[foo]] {{.*}} [[#CU]]
+ // CHECK-SPIRV: [[#FuncK:]] [[#]] DebugFunction [[k]] {{.*}} [[#CU]]
+-- 
+2.43.0
+
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild
index 8805557f442f..d0887f26c351 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild
@@ -35,7 +35,10 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-17.0.0-intel-capability.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-intel-capability.patch
+	"${FILESDIR}"/${P}-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch
+)
 
 src_prepare() {
 	append-flags -fPIC