gentoo auto-resync : 27:07:2023 - 04:33:08

3 files changed, 74 insertions, 9 deletions

diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 789980d25ff6..684a2422b44b 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,7 +1,7 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
 AUX opencl-clang-16.0.0-clang_library_dir.patch 1671 BLAKE2B 182983a930084518ebb6d792cea82bfe5794a5e3621b5b003e9fe7d60c5c14bba85bb5de5fb2ee9f13aa4e9b0fea1f17fdb7a7f78942299a7205891dc600f7a0 SHA512 ad8da56c9dc18c82a72aede3f46d2047ac7b49b5ce8a297a65a61fbb5dd692e1f93d77ef4808f34db99a59b3f70c1d957b658dd849b510458e0fddb101f0039f
 AUX opencl-clang-16.0.0-cxx17.patch 727 BLAKE2B e5cfa0aa72e0322e1d5f4a062d88d92f163796ceab58c1d831b3a06d994d86bf565cc4cf79b53d90294c57b8c358e94c4f7b48294e759ed5fa2e65eee91906fa SHA512 4047bfa9a6e895ac5e9be5d19a625cd17ae01417f2c05b2ac34a91a1b671180c92855f909bd8f6e52037044f061567529c72cd87d5296e78ce30a3351fea5dd2
-AUX opencl-clang-16.0.0-llvm.patch 1419 BLAKE2B bfa1bc4a2252fe47f3c36294184b5ce151d840dc88e03b2eb6c228b7ca046363c899f9a497ac75d293ffaed08cda94f57921fefd17cfc7fedb2a9172eb0ebff1 SHA512 4f407a8272308e3f730b3b10ea082e956dade462700b2145b5b8c36b4653b5e46a834722b2314163abc4b4aa4f23b3783856588000853218b017bd27188573d3
+AUX opencl-clang-16.0.0-llvm.patch 3615 BLAKE2B b0e67c65c7ccc9a0aea143d7aeea4be7025d8abdbb34c712ca1306107834b1cf41a4e4d4b65b03bff089afb69d122b735af6913592350ee96abf27982763abaf SHA512 c28103172a0dd72e6a4e94a119c5a8957e273d736ca05dedbf119bdf1860ee89745ad3c868d8400bc690e75c02971be417e432ee27d1629a1715b7d39a361cc2
 AUX opencl-clang-16.0.0-standalone-build.patch 967 BLAKE2B 35b0a40a6a2fe094711276b62ae53167560bd11ee6581a499568eaf8b2cf5e1a52aee30b5911604297c64e7262e55a07afc12a9dcc00862ecd0c2e1f9a982046 SHA512 9cba49fc8ccb12d38a5aaa9ee69c2425bdc069b2d2cd6d0157875157d67a3e1b5cedf3d7b3b081ca6012cedf7e60abb4ca205577f10dcff4f3a153758ddf520b
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-14.0.0.tar.gz 26109 BLAKE2B 2ae5e6d69e2f13b867712d03b52fce893aeb70566f7f97d54858639786276f49b0b6b5768aebfedeb7fe50d95511178d7dd9df7e80d3fd27df1fb3fe1d2ab955 SHA512 ab9a3fd40542283bdd2646d9ef8d3217420c82a41b183d705e48f48949505ecadc1fa435e23a7ceadf5a335200f5f3752b42715e2ac7f63173fc09637c5c609a
@@ -9,5 +9,5 @@ DIST opencl-clang-15.0.0.tar.gz 26212 BLAKE2B 02d3a8eb3964b6882bd94b676b4459412c
 DIST opencl-clang-16.0.0.tar.gz 28413 BLAKE2B c99f043171186f5d9e44618d5d637d6a5c7997f22577491f544e78d93edd5afe74ba88eaaea92a931dd87af71fb630fdf03d27f1a9f55d7c3b8bdf53dee54b07 SHA512 bf723edab7dc7a028eb79d01fd2306690a2169472760bf2783d593ffec4eb788f28f184c66b204cc074cb95a4149fcc63a1dcbee5563c620a9dc2c76bb5a2d5a
 EBUILD opencl-clang-14.0.0.ebuild 879 BLAKE2B c8e67dc6c53a91e153bec1b9c22849ae0a56aa009ee3b317b8332858fc19cc2d28afbf4fe312dfed35bd0b0614e2e64498dc68c8cadcad83aa417b0948b7a34a SHA512 41e32bdafaf1a956120b0bce9ba5f792335a68145e7665d22d153398cee8923bb62b8c3777005bb34d9df9fde331e416b360ae9231e2e7dd53392e38e0e8c991
 EBUILD opencl-clang-15.0.0.ebuild 842 BLAKE2B c516ee1dc3f7e4bb1c1be637b44f151b33a0d36921d907568f561f3be5bd3762d56b88468bb2d146ff57bbc708b6e006e4c10a83825ae536b93ce80edc105d9d SHA512 a12ff19192edfbb5f90adea21510454fc77b387ac44a35e9d70c0c25ded54dc4c9ed327394097a1eeb0f912507bf3354d2b2fe196bac21034e4a4dd05e9eb497
-EBUILD opencl-clang-16.0.0.ebuild 961 BLAKE2B 20b1be5db6e4ef6ec29a8f037c987cbd50684574a58711bc157ebcdf1cf51544df710df4e482646e7139ce52f562a43023c0a060b6c1c9078075f6f2e3259e25 SHA512 3d3d12b2e91a3b721a5fd24dc4f53896b640e6e866d90e6235877ba76d511fc3cd2ddb01c21c38be7808e93a461e85a5b1b544caa9aeeb2f7ff47cc4855760fb
+EBUILD opencl-clang-16.0.0-r1.ebuild 961 BLAKE2B 20b1be5db6e4ef6ec29a8f037c987cbd50684574a58711bc157ebcdf1cf51544df710df4e482646e7139ce52f562a43023c0a060b6c1c9078075f6f2e3259e25 SHA512 3d3d12b2e91a3b721a5fd24dc4f53896b640e6e866d90e6235877ba76d511fc3cd2ddb01c21c38be7808e93a461e85a5b1b544caa9aeeb2f7ff47cc4855760fb
 MISC metadata.xml 583 BLAKE2B a16519cc07cd2add030b90218d3cdcf9473c684e0a1a0149e7dd352881213c8579c3ed7ceee69db479264fca10561ac023c01be7451ce689fa6408b81cf8b032 SHA512 d3c3f41c5c5fdb4b6b85c737071540ef8d53e148d5f7e69367eeaa6cbe7cb84563d2381de851cc4da41b5300856dd7e6b1e67454a4fc9a9d890590e3a17526b5
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch
index 67759595b353..659a2b90bf6c 100644
--- a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch
@@ -1,9 +1,73 @@
+commit e047ae6bb9cef488781e0b06c5ae9018bacb24c4
+Author: Wenju He <wenju.he@intel.com>
+Date:   Thu May 18 16:01:52 2023 +0800
+
+    Revert to use add_llvm_library and revert linking LLVM libraries (#438)
+    
+    Add cmake option EXCLUDE_LIBS_FROM_ALL to remove a specific llvm library
+    from llvm 'all'.
+    
+    This PR partially reverts 743bd15.
+    This PR addresses #401, #417, #418, #422, and brings back SONAME.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7d1927..be4fefd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -335,36 +335,7 @@
- target_link_libraries( ${TARGET_NAME}
-                        LINK_PRIVATE
-                        ${OPENCL_CLANG_LINK_LIBS}
+@@ -298,21 +298,23 @@ else()
+   )
+ endif()
+ 
+-add_library(${TARGET_NAME} SHARED
+-    ${TARGET_INCLUDE_FILES}
+-    ${TARGET_SOURCE_FILES}
+-    $<TARGET_OBJECTS:cl_headers>
+-)
+-
+-# Same CRT compile option are reqiured to avoid link errors on Windows.
+-# MD and MDd are choosed by default for release and debug build in LLVM.
+-# If users set MT or MTd flags, they also need to add the flags for
+-# opencl-clang sources using a custom macro set_msvc_crt_flags.
+-if(COMMAND set_msvc_crt_flags)
+-    set_msvc_crt_flags(${TARGET_NAME})
++set(EXCLUDE_LIBS_FROM_ALL "" CACHE STRING "Space-separated list of LLVM libraries to exclude from all")
++llvm_map_components_to_libnames(ALL_LLVM_LIBS all)
++if (NOT "${EXCLUDE_LIBS_FROM_ALL}" STREQUAL "")
++  list(REMOVE_ITEM ALL_LLVM_LIBS ${EXCLUDE_LIBS_FROM_ALL})
+ endif()
++list(APPEND OPENCL_CLANG_LINK_LIBS ${ALL_LLVM_LIBS})
++
++add_llvm_library(${TARGET_NAME} SHARED
++  ${TARGET_INCLUDE_FILES}
++  ${TARGET_SOURCE_FILES}
++  $<TARGET_OBJECTS:cl_headers>
+ 
+-add_dependencies(${TARGET_NAME} CClangCompileOptions)
++  DEPENDS CClangCompileOptions
++
++  LINK_LIBS
++    ${OPENCL_CLANG_LINK_LIBS}
++  )
+ 
+ if (WIN32)
+     # Enable compiler generation of Control Flow Guard security checks.
+@@ -328,51 +330,6 @@ elseif(UNIX)
+         LINK_FLAGS " -Wl,--no-undefined")
+ endif(WIN32)
+ 
+-# Enable new IN_LIST operator.
+-cmake_policy(SET CMP0057 NEW)
+-set(OTHER_LIBRARIES)
+-if ("NVPTX" IN_LIST LLVM_TARGETS_TO_BUILD)
+-    list(APPEND OTHER_LIBRARIES LLVMNVPTXCodeGen LLVMNVPTXDesc LLVMNVPTXInfo)
+-endif()
+-if ("AMDGPU" IN_LIST LLVM_TARGETS_TO_BUILD)
+-    list(APPEND OTHER_LIBRARIES LLVMAMDGPUCodeGen LLVMAMDGPUAsmParser LLVMAMDGPUDesc LLVMAMDGPUInfo)
+-endif()
+-
+-target_link_libraries( ${TARGET_NAME}
+-                       LINK_PRIVATE
+-                       ${OPENCL_CLANG_LINK_LIBS}
 -                       LLVMX86CodeGen
 -                       LLVMX86AsmParser
 -                       LLVMX86Desc
@@ -34,7 +98,8 @@
 -                       LLVMTarget
 -                       LLVMBitReader
 -                       ${OTHER_LIBRARIES}
-+                       LLVM
-                       )
- 
+-                      )
+-
  install(FILES opencl_clang.h
+         DESTINATION include/cclang
+         COMPONENT ${TARGET_NAME})
diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild
index 72b5408a634a..72b5408a634a 100644
--- a/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-16.0.0-r1.ebuild