diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-05 05:29:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-05 05:29:57 +0100 |
| commit | 4e777c0133d093c9c8b992c92e0f244e2055bf71 (patch) | |
| tree | d6fbeed2e9eb1b486babf5d6f4886da4bdba4dbc /dev-libs/opencl-clang/files | |
| parent | 6f57e716c7968def6387f9db258e883125bab84f (diff) | |
gentoo auto-resync : 05:05:2023 - 05:29:57
Diffstat (limited to 'dev-libs/opencl-clang/files')
4 files changed, 125 insertions, 0 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 new file mode 100644 index 000000000000..227a7be30b50 --- /dev/null +++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch @@ -0,0 +1,36 @@ +From 9f50367661bb6345bf7b18102f1e415378afda06 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com> +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 new file mode 100644 index 000000000000..aa6c308630e8 --- /dev/null +++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch @@ -0,0 +1,23 @@ +From 5491ffa3fde5729074fe804023bd279c56684f77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com> +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 new file mode 100644 index 000000000000..67759595b353 --- /dev/null +++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch @@ -0,0 +1,40 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -335,36 +335,7 @@ + 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} ++ LLVM + ) + + install(FILES opencl_clang.h 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 new file mode 100644 index 000000000000..a85ec58df401 --- /dev/null +++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch @@ -0,0 +1,26 @@ +From 529a9188114bcbd8ed753d2276942384fa50d7a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com> +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() |