commit: f0a696fe6fe8e3a13d76bae147e965626dc49919 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Dec 24 15:09:56 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Thu Jan 2 00:02:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a696fe
dev-libs/opencl-clang: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../opencl-clang-16.0.0-clang_library_dir.patch | 36 ------- .../files/opencl-clang-16.0.0-cxx17.patch | 23 ----- .../files/opencl-clang-16.0.0-llvm.patch | 105 --------------------- .../opencl-clang-16.0.0-standalone-build.patch | 26 ----- 4 files changed, 190 deletions(-) diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch deleted file mode 100644 index 227a7be30b50..000000000000 --- a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9f50367661bb6345bf7b18102f1e415378afda06 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <[email protected]> -Date: Fri, 21 Apr 2023 04:08:11 +0200 -Subject: [PATCH] Support llvm headers in - ${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/ (#419) - -Fedora places llvm include files into that directory instead of assumed -${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/ - -Try both, fail horribly when none of them exist ---- - cl_headers/CMakeLists.txt | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt -index 86df76f..0223d52 100644 ---- a/cl_headers/CMakeLists.txt -+++ b/cl_headers/CMakeLists.txt -@@ -19,8 +19,15 @@ add_custom_command( - endfunction(copy_file) - - if(USE_PREBUILT_LLVM) -- set(OPENCL_HEADERS_DIR -- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/") -+ if(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/") -+ set(OPENCL_HEADERS_DIR -+ "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/") -+ elseif(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/") -+ set(OPENCL_HEADERS_DIR -+ "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/include/") -+ else() -+ message(FATAL_ERROR "[OPENCL-CLANG] Couldn't find prebuilt LLVM include directory.") -+ endif() - else(USE_PREBUILT_LLVM) - set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers") - endif(USE_PREBUILT_LLVM) diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch deleted file mode 100644 index aa6c308630e8..000000000000 --- a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5491ffa3fde5729074fe804023bd279c56684f77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <[email protected]> -Date: Mon, 24 Apr 2023 10:29:36 +0200 -Subject: [PATCH] Bump CMAKE_CXX_STANDARD to 17 (#416) - -Fixes build issues ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc471d8..a7d1927 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - ${CMAKE_MODULE_PATH} - ${LLVM_CMAKE_DIR}) - -- set(CMAKE_CXX_STANDARD 14) -+ set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - - option(LLVMSPIRV_INCLUDED_IN_LLVM 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 deleted file mode 100644 index 659a2b90bf6c..000000000000 --- a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch +++ /dev/null @@ -1,105 +0,0 @@ -commit e047ae6bb9cef488781e0b06c5ae9018bacb24c4 -Author: Wenju He <[email protected]> -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 -@@ -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 -- LLVMX86Info -- LLVMX86Disassembler -- LLVMAnalysis -- LLVMCodeGen -- LLVMCore -- LLVMipo -- LLVMInstCombine -- LLVMInstrumentation -- LLVMMC -- LLVMMCParser -- LLVMObjCARCOpts -- LLVMOption -- LLVMScalarOpts -- LLVMSupport -- LLVMTransformUtils -- LLVMVectorize -- LLVMAsmPrinter -- LLVMSelectionDAG -- LLVMMCDisassembler -- LLVMProfileData -- LLVMObject -- LLVMBitWriter -- LLVMIRReader -- LLVMAsmParser -- LLVMTarget -- LLVMBitReader -- ${OTHER_LIBRARIES} -- ) -- - install(FILES opencl_clang.h - DESTINATION include/cclang - COMPONENT ${TARGET_NAME}) diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch deleted file mode 100644 index a85ec58df401..000000000000 --- a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 529a9188114bcbd8ed753d2276942384fa50d7a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <[email protected]> -Date: Fri, 21 Apr 2023 04:07:21 +0200 -Subject: [PATCH] Fix standalone build (#415) - -Fixes https://github.com/intel/opencl-clang/issues/406 -Fixes https://github.com/intel/opencl-clang/issues/374 ---- - cl_headers/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt -index 788adff..86df76f 100644 ---- a/cl_headers/CMakeLists.txt -+++ b/cl_headers/CMakeLists.txt -@@ -1,5 +1,9 @@ - set(CL_HEADERS_LIB cl_headers) --set(CLANG_COMMAND $<TARGET_FILE:clang> ) -+if(USE_PREBUILT_LLVM) -+ find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+else() -+ set(CLANG_COMMAND $<TARGET_FILE:clang>) -+endif() - if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL) - build_native_tool(clang CLANG_COMMAND) - endif()
