From d4f25f4c83ea9d7212576e762295f53c00f8c6fc Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 3 Aug 2023 09:34:57 +0800 Subject: opencl-clang/14.0: update to latest Drop the patch that is not needed anymore. Signed-off-by: Anuj Mittal (cherry picked from commit efd8310cbed3b4dc8db1b24bee09003186bf66d8) Signed-off-by: Anuj Mittal --- .../0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch | 32 ---------------------- .../opencl-clang/opencl-clang_14.0.0.bb | 6 ++-- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch (limited to 'dynamic-layers/clang-layer/recipes-opencl/opencl-clang') diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch deleted file mode 100644 index 8df7e3ab..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Thu, 2 Apr 2020 08:59:20 +0800 -Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE - -Use the value that has been passed by the user. - -Upstream-Status: Submitted -Signed-off-by: Anuj Mittal ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6893e97..941b0ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM) - set (COMPILE_OPTIONS_TD opencl_clang_options.td) - set (COMPILE_OPTIONS_INC opencl_clang_options.inc) - --set(LLVM_TABLEGEN_EXE "llvm-tblgen") -+if(NOT DEFINED LLVM_TABLEGEN_EXE) -+ set(LLVM_TABLEGEN_EXE "llvm-tblgen") -+endif() -+ - set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) - if(USE_PREBUILT_LLVM) - set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) --- -2.25.1 - 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 a590b38d..a36bd53b 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,8 +1,6 @@ require opencl-clang.inc -SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ - " -SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f" +SRCREV = "cf95b338d14685e4f3402ab1828bef31d48f1fd6" BRANCH = "ocl-open-140" @@ -16,5 +14,5 @@ EXTRA_OECMAKE += "\ do_install:append:class-native() { install -d ${D}${bindir} - install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ + install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/ } -- cgit v1.2.3-54-g00ecf