Drop the patch that has now been backported to LLVM 14 and 15 branches. Signed-off-by: Anuj Mittal <[email protected]> --- .../files/0001-Fix-standalone-build-415.patch | 32 ------------------- .../opencl-clang/opencl-clang.inc | 1 - .../opencl-clang/opencl-clang_14.0.0.bb | 2 +- .../opencl-clang/opencl-clang_15.0.0.bb | 2 +- 4 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch deleted file mode 100644 index 3767d537..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c2481fb3c7890302db5ee326ad9807155a2a2188 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 1/2] Fix standalone build (#415) - -Fixes https://github.com/intel/opencl-clang/issues/406 -Fixes https://github.com/intel/opencl-clang/issues/374 - -Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/529a9188114bcbd8ed753d2276942384fa50d7a1] -Signed-off-by: Anuj Mittal <[email protected]> ---- - 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 69cf11e..18296c2 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() --- -2.37.3 - diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc index 7c8c2513..31a3fb21 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc @@ -6,7 +6,6 @@ LICENSE = "NCSA" LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=https \ - file://0001-Fix-standalone-build-415.patch \ file://0002-Request-native-clang-only-when-cross-compiling-464.patch \ file://0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch \ " diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb index 2a7af0c9..7e56af75 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb @@ -1,5 +1,5 @@ require opencl-clang.inc -SRCREV = "cf95b338d14685e4f3402ab1828bef31d48f1fd6" +SRCREV = "980f1691c5babcf824ee10375a04a0d0c5d7d44a" BRANCH = "ocl-open-140" diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb index 0865a2af..e946c31c 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb @@ -1,5 +1,5 @@ require opencl-clang.inc -SRCREV = "bc1d13ecc1c6f7aa5da3acf33165037d3fc5ed06" +SRCREV = "60fd799cc58755c16d951f9ebfde6d0f9b8554dd" BRANCH = "ocl-open-150" -- 2.41.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8120): https://lists.yoctoproject.org/g/meta-intel/message/8120 Mute This Topic: https://lists.yoctoproject.org/mt/101853766/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/leave/6694807/21656/1869269227/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
