From b572565b942197ef017b9f2182ddeb318c6d4a77 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 3 Aug 2023 09:44:39 +0800 Subject: opencl-clang: move common code to inc Signed-off-by: Anuj Mittal (cherry picked from commit 711eee2b8e9a9bed92eaf95398076e35310a5d76) Signed-off-by: Anuj Mittal --- .../recipes-opencl/opencl-clang/opencl-clang.inc | 13 +++++++++++++ .../recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb | 13 ------------- .../recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb | 13 ------------- 3 files changed, 13 insertions(+), 26 deletions(-) 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 061ecbba..7c8c2513 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 @@ -19,4 +19,17 @@ DEPENDS:append:class-target = " opencl-clang-native" COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST:libc-musl = "null" +DEPENDS += " spirv-llvm-translator" + +EXTRA_OECMAKE += "\ + -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ + -DCMAKE_SKIP_RPATH=TRUE \ + -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ + " + +do_install:append:class-native() { + install -d ${D}${bindir} + install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/ +} + BBCLASSEXTEND = "native nativesdk" 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 a36bd53b..2a7af0c9 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 @@ -3,16 +3,3 @@ require opencl-clang.inc SRCREV = "cf95b338d14685e4f3402ab1828bef31d48f1fd6" BRANCH = "ocl-open-140" - -DEPENDS += " spirv-llvm-translator" - -EXTRA_OECMAKE += "\ - -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ - " - -do_install:append:class-native() { - install -d ${D}${bindir} - install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/ -} 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 84629cff..0865a2af 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 @@ -3,16 +3,3 @@ require opencl-clang.inc SRCREV = "bc1d13ecc1c6f7aa5da3acf33165037d3fc5ed06" BRANCH = "ocl-open-150" - -DEPENDS += " spirv-llvm-translator" - -EXTRA_OECMAKE += "\ - -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ - " - -do_install:append:class-native() { - install -d ${D}${bindir} - install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/ -} -- cgit v1.2.3-54-g00ecf