gentoo auto-resync : 01:11:2023 - 15:50:35

4 files changed, 71 insertions, 1 deletions

diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index c5455cf7bf17..5de854a85fad 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -23,6 +23,8 @@ AUX rocm-comgr-5.7.0-lld.patch 1355 BLAKE2B 565e3052974b99ee5050fc1b64d5f3b33786
 AUX rocm-comgr-5.7.0-metadata.patch 2738 BLAKE2B de124cc61ad4e59ca182a8868bdff0c2fa44ec8a474f4c2d31aae8b90aabee6b32394959dd3589cf4756d09cb26dc1691df386f0b6687bb365dfabe6b76f2622 SHA512 440a6cc6fed0c4091effc39ffab5b4f59c0d503db7ea6bd8eae681422b4b385f3f8176722f7a2b396cced8229a9c3904ac795c62949bc805284e6a0203ab9bba
 AUX rocm-comgr-5.7.0-optional.patch 3965 BLAKE2B 78b837f4f2797274fe38cc1ceb1d1e7a4b40936199acc3a97150f9ac637dfd5b1e6f9bf6b285ede5ec10010ec90a9379ce31248049becfedeb9c0d8d20b4f0f7 SHA512 6a0f9c5bcaed29d792d41180b261ba3cb9384b2a726cef304664438abb47ac9b084c2c230ccd66ba5257ac39f0690bfab9b90840b4a9a23a020adbcb804a0d7c
 AUX rocm-comgr-5.7.0-symbolizer.patch 1503 BLAKE2B fa8071ad2bbcd0ab4e6f05260617cfa693be6b9000ba240c7faa8e5e4a22e66f5e52b584d7673d8a55881677f864c5cadff7a488feb3cd4ff1194a60b63d68d5 SHA512 624ed4647c8b8bb9d8945acdd3166a78d6333a34397e4980c4ce29a8389768cd286eeeca7ee92aa8969c607081afce4acfe4548074b16034ad59108d84fbb0fc
+AUX rocm-comgr-5.7.1-correct-license-install-dir.patch 549 BLAKE2B c45452d4af4718aca315862064596347f5caa9301a02fb14228daa72fee70d7452d3f24ee7dfc9247433388655ec7cccf3168eeea17ce425bd2090230e57e451 SHA512 8a49aec20da6c35989fbafc985b9c3bc21f20b711e2bd6921b67542f83cf07557afffefc9dafa860eefea5db17203d7a064755059e6e16d2c083b09ef01e9a22
+AUX rocm-comgr-5.7.1-fix-tests.patch 1733 BLAKE2B 0b92d01929fd0376ef33dfca3dd2e43956a3652c9c653b3e30ddb3d7487caf8858367447270328c2ff6d9963d786c8ae50cc21efc90e9a9594bb9f50ecec5667 SHA512 181074ecd0a76f6dfabf476bbe98e399caec4e8b3dd04b01318dbfa34253ee5c27f28296f1f07801960b5b3abab1d07dac18e8e61d1e30971520c7df77364607
 DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b
 DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B 29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1 SHA512 ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f
 DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f SHA512 1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4
@@ -32,5 +34,5 @@ EBUILD rocm-comgr-5.1.3-r3.ebuild 2051 BLAKE2B 98d8ad8164c8a401961a9abb1a973e112
 EBUILD rocm-comgr-5.3.3-r2.ebuild 1943 BLAKE2B e286731895a9cb985eef52ab23fea988d11fc4294fc65c91b9dc81ec5af8c5a747ae699a6af878436e8260c77e94402593fccae9dd8fdd65f05c3da27087b82f SHA512 fd5a47cb1eb354078c9aa4f5fc27d05629a7f40984e9f166a36a5d47faf8ccf3321d8a326145e192c25cc685ed041e9c756b7e57598902acc07c743ea0c7cc3c
 EBUILD rocm-comgr-5.4.3-r1.ebuild 1892 BLAKE2B 3225c9fc2eb31f8810e1072ccf20681987ed6d8072f7bb0a1d661ab2eb327ad30afa0a6fd8f8299bd626f34cffd25e9f15d42a5e7fb6ac62f314755ce1ca3116 SHA512 265cd1523b8dc85a875a008cb8a2b6b3098cc07277199c3cccb749f4a30d22d8e71eefba1474aad18034b13002d734b46cec614f1fe56e67c4482dbeb8bc0079
 EBUILD rocm-comgr-5.5.1.ebuild 2022 BLAKE2B 7bc047bb17510907af10ce3763ccc6bd52d1bccb4264bd920936dd76d9e7040565b041ed4f6422ca858a40f8c1f073a8bcec5d9b93bea947e72aa48091cf3f6a SHA512 31024125b88958a422fec60cb35eb2aa7f3c9ec0862c2f218f8b6c7ce1ccc3515f3976de53d79715c6e3bcbb3fccc6ee4347013e711379702c88b1ebdee894bf
-EBUILD rocm-comgr-5.7.1.ebuild 1847 BLAKE2B bb5b2b2cfc5b5388c2ba27d4085167f637f831dd802bcbe9213e98a7ce1f6d58a5370a33368e82c4347c455a78ff9d43cdead944cbeac67ede65561607b04e6c SHA512 fd82efa78417e94337c20af1a5021c70ebda8525014a87061d96ca5d6b4fbbae97cc0bfc99adacf706a5fa34e080e4aa3cce88796023805cfc2d5a22e53c2fa3
+EBUILD rocm-comgr-5.7.1.ebuild 1951 BLAKE2B 7129f908ca36c54c3ffc69be5f4b58b55308d5a76dc9d1a1095379098d215726a4be033f28c27ec9938054d13f6c8e853206939717691c419654666ad5807efa SHA512 d470c4e665f0d0259fd508304d8770f3243ea721f4259a4267970d48ed08f6163e61e7f02caae553f29d110b24f3a0a61b7fce1c1e529f00af5ef5e41bf2e746
 MISC metadata.xml 526 BLAKE2B d2c4b5c4210cd4ae436bc205ec6c6d0e2690edc99250e508b64f3abbf0f7b4a61b27cb627d9453ff6432cd683fb7f51460b4e821ce7614880e68854121297db5 SHA512 5cf80a58a6791b404d33577fa1cd199791ad4348d0e18d2ba9d8e1665cfc5a19c7d37cfe265c77c060bc886f24ce28b592c6b7d541531faaf62e5440b732d2e7
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-correct-license-install-dir.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-correct-license-install-dir.patch
new file mode 100644
index 000000000000..8ec2c710d3ad
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-correct-license-install-dir.patch
@@ -0,0 +1,16 @@
+Do not install same license for -asan, which avoids QA warning
+Upstream issue: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/61
+===================================================================
+--- comgr.orig/CMakeLists.txt
++++ comgr/CMakeLists.txt
+@@ -281,10 +281,6 @@ install(FILES
+   "NOTICES.txt"
+   COMPONENT amd-comgr
+   DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-install(FILES
+-  "LICENSE.txt"
+-  COMPONENT asan
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan)
+ 
+ # Generate the install-tree package.
+ set(AMD_COMGR_PREFIX_CODE "
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests.patch
new file mode 100644
index 000000000000..80f1f90dbe94
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.7.1-fix-tests.patch
@@ -0,0 +1,50 @@
+Vanilla LLVM does not support calling AMDGPU_KERNEL across different sources/bitcodes.
+Without this patch https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/45 occurs.
+Reference: https://github.com/llvm/llvm-project/issues/60313
+===================================================================
+Index: comgr/test/source/source1.cl
+===================================================================
+--- comgr.orig/test/source/source1.cl
++++ comgr/test/source/source1.cl
+@@ -35,7 +35,9 @@
+ 
+ #include "include-a.h"
+ 
++void kernel source3(__global int *j) { *j = FOO; }
++
+ void kernel source1(__global int *j) {
+   *j += 2;
+-  source2(j);
++  source3(j);
+ }
+Index: comgr/test/mangled_names_test.c
+===================================================================
+--- comgr.orig/test/mangled_names_test.c
++++ comgr/test/mangled_names_test.c
+@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) {
+     exit(1);
+   }
+ 
+-  const char *bcNames[] = {"source1", "source2"};
++  const char *bcNames[] = {"source3", "source1"};
+ 
+   for (size_t I = 0; I < numNames; ++I) {
+     size_t Size;
+@@ -249,14 +249,14 @@ int main(int argc, char *argv[]) {
+ 
+   Status = amd_comgr_populate_mangled_names(DataExec, &numNames);
+ 
+-  if (numNames != 4) {
++  if (numNames != 6) {
+     printf("amd_populate_mangled_names Failed: "
+-           "produced %zu executable names (expected 4)\n",
++           "produced %zu executable names (expected 6)\n",
+            Count);
+     exit(1);
+   }
+ 
+-  const char *execNames[] = {"source1", "source1.kd", "source2", "source2.kd"};
++  const char *execNames[] = {"source3", "source3.kd", "source1", "source1.kd", "source2", "source2.kd"};
+ 
+   for (size_t I = 0; I < numNames; ++I) {
+     size_t Size;
diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild
index 28f2b5385c71..ff181f1b4615 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild
@@ -29,6 +29,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.7.0-disassembly.patch"
 	"${FILESDIR}/${PN}-5.7.0-metadata.patch"
 	"${FILESDIR}/${PN}-5.7.0-symbolizer.patch"
+	"${FILESDIR}/${PN}-5.7.1-fix-tests.patch"
+	"${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch"
 )
 
 DESCRIPTION="Radeon Open Compute Code Object Manager"