gentoo auto-resync : 04:05:2023 - 11:28:04

3 files changed, 71 insertions, 4 deletions

diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 5540a88039b0..e0df2bf8cb85 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,8 +1,9 @@
+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
 DIST spirv-llvm-translator-14.0.0.tar.gz 1482704 BLAKE2B f88eb8f4cd652c448e465605ec8c34bb80f87f1269c244b33be542ae98ef97ea04a759b9cd9fed0814f4360733d7560d301d2b8d586706d1ca988b4524526aeb SHA512 5659149a380ceef7acdcb274bcad9b23e4817bf88e795e0a8464dfe14fbd102dbf7199cbe67eb611a16d3a411c7a1b8afc6f0eef61fec5a2b8f9fba06748bcb1
 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
 EBUILD spirv-llvm-translator-14.0.0-r1.ebuild 1203 BLAKE2B 0bf581cbfcda0ae078bbcbb4792a19415b326d3bc14cac4c2e616ff2a16f8d15f3b98d852a6d40df4ce0121ae4a331ee49733c676eff862ef0fea270d1fa3b43 SHA512 db59082eb283cf789cbb9ed9604890bc4079932e45e4f3dcb98fd106dc9757b7f496eac1c2c0aaba7184bef2900efd12ce4c4d3609ce84b3c792c5174d6ae8d5
 EBUILD spirv-llvm-translator-15.0.0.ebuild 1215 BLAKE2B feb9976829786cb06f9b94ab72e638f7787f25f5867827d7c8bf0314f5f678b6b0007ed2971936c6b0364423ff974ede45f02b1580f98415b85e09f158dd9566 SHA512 ad9c7fc3cbd4c78587925a6413fb2f8b568e3eea46da10b3ad4a9d5de94aa69c64461be457954d6f437af56f23320a429afc357fdddd50d8e6058384577217a6
-EBUILD spirv-llvm-translator-16.0.0.ebuild 1276 BLAKE2B 1f3434ce9492ba1e5cb78f42afa588ebcd187f0d1dce9db17ef9ac071752d5a6eaa775adeaa239bd8801bba75a9d2eb39c1ffb0b382fb821d7461cbe30acd377 SHA512 208f742fc6764eb480aaed67ae836e42570e4acbd43928564ab541f86acb03c833d00a702e3b91222ea71c0cb6331ac165f90d1ddc3687832e5e6b304f2ae11a
+EBUILD spirv-llvm-translator-16.0.0.ebuild 1381 BLAKE2B 7f702966bc77c58473d5eacab0dbf21612914c16e8e49c3b0fb3cf3b11061d941c3e2c4de62461e10818ff9f63af017650cd27d94f62736d392b4d2c1e9db970 SHA512 07762045809880dfc41ef8293c1db113f36284e37b6447d8f28cffcacf536a6de14d2b472e229aa617e48872b28dcac2622a78915f62c7950aba417135da6d6a
 MISC metadata.xml 696 BLAKE2B 8d5fd20aa6ce0ed9c7660ac356f9c2274c8262680faf04aa647890044e8c48703366aa59a6c9b638105a5269ae2bcc7d1ccdb01fbb268b2054d6dce7a9cb875b SHA512 c0ce5f3a5eefced8c2a3fe8988009f4ae2dab5c1a93d5f908d24e2445696799dc937cde7f1ec29237ce44a653d496a74b246ac9d65ab132c33c5334990a6238e
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-ld_library_path.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-ld_library_path.patch
new file mode 100644
index 000000000000..3068cd535005
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-16.0.0-ld_library_path.patch
@@ -0,0 +1,63 @@
+From c2133b18cb48b9bb9c47897b16d64c5f0547cde6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 4 May 2023 08:44:25 +0200
+Subject: [PATCH] [test] Use LD_LIBRARY_PATH to ensure that a new lib is used
+ (#1989)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add the library `BINARY_DIR` to `LD_LIBRARY_PATH` to ensure that
+the freshly built `libLLVMSPIRVLib.so` is tested.  Otherwise, llvm-spirv
+spawned by the test suite may use the previously installed
+`libLLVMSPIRVLib.so`.
+
+I have noticed the problem after rebuilding LLVM with
+`-DLLVM_ENABLE_ASSSERTIONS=ON`.  This meant that the previous version
+of `libLLVMSPIRVLib.so` now crashed, effectively causing the test suite
+to fail incorrectly.
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ test/CMakeLists.txt     | 1 +
+ test/lit.cfg.py         | 3 ++-
+ test/lit.site.cfg.py.in | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 235f6d0a0..355baffb8 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -3,6 +3,7 @@ llvm_canonicalize_cmake_booleans(SPIRV_SKIP_DEBUG_INFO_TESTS)
+ 
+ # required by lit.site.cfg.py.in
+ get_target_property(LLVM_SPIRV_DIR llvm-spirv BINARY_DIR)
++get_target_property(LLVM_SPIRV_LIB_DIR LLVMSPIRVLib BINARY_DIR)
+ set(LLVM_SPIRV_TEST_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ if(SPIRV_TOOLS_FOUND AND NOT SPIRV-Tools-tools_FOUND)
+diff --git a/test/lit.cfg.py b/test/lit.cfg.py
+index 4b66412c3..fd8d3f94c 100644
+--- a/test/lit.cfg.py
++++ b/test/lit.cfg.py
+@@ -76,6 +76,7 @@
+ else:
+     config.substitutions.append(('spirv-val', ':'))
+ 
++llvm_config.with_system_environment('LD_LIBRARY_PATH')
+ if using_spirv_tools:
+-    llvm_config.with_system_environment('LD_LIBRARY_PATH')
+     llvm_config.with_environment('LD_LIBRARY_PATH', config.spirv_tools_lib_dir, append_path=True)
++llvm_config.with_environment('LD_LIBRARY_PATH', config.llvm_spirv_lib_dir, append_path=True)
+diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
+index a01f2bb34..fdc4f4319 100644
+--- a/test/lit.site.cfg.py.in
++++ b/test/lit.site.cfg.py.in
+@@ -6,6 +6,7 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
+ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+ config.llvm_spirv_dir = "@LLVM_SPIRV_DIR@"
++config.llvm_spirv_lib_dir = "@LLVM_SPIRV_LIB_DIR@"
+ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
+ config.llvm_shlib_dir = "@SHLIBDIR@"
+ config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
index 2ecbe13bf889..fd9d9851fd82 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-16.0.0.ebuild
@@ -7,7 +7,7 @@ LLVM_MAX_SLOT="16"
 MY_PN="SPIRV-LLVM-Translator"
 MY_P="${MY_PN}-${PV}"
 
-inherit cmake flag-o-matic llvm
+inherit cmake flag-o-matic llvm multiprocessing
 
 DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
@@ -34,7 +34,10 @@ BDEPEND="
 	test? ( dev-python/lit )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-16.0.0-llvm-link-llvm-dylib.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-16.0.0-llvm-link-llvm-dylib.patch"
+	"${FILESDIR}/${PN}-16.0.0-ld_library_path.patch"
+)
 
 src_prepare() {
 	append-flags -fPIC
@@ -55,5 +58,5 @@ src_configure() {
 }
 
 src_test() {
-	lit "${BUILD_DIR}/test" || die
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
 }