From 68e00896f2c669044f6ad8cbbc9958332254a4e4 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 5 Apr 2022 10:57:12 +0800 Subject: opencl-clang: upgrade 13.0.0 -> 14.0.0 Signed-off-by: Anuj Mittal --- conf/machine/include/meta-intel.inc | 4 ++-- .../recipes-opencl/opencl-clang/opencl-clang_13.0.0.bb | 15 --------------- .../recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_13.0.0.bb create mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 511179e3..f6b3e38f 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -21,8 +21,8 @@ PREFERRED_PROVIDER_libva-utils = "libva-intel-utils" PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native" PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils" -PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '13.0.0', d)}" -PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '13.0.0', d)}" +PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '14.0.0', d)}" +PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '12.0.0', '12.0.0', '14.0.0', d)}" XSERVER_X86_ASPEED_AST = "xf86-video-ast \ " diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_13.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_13.0.0.bb deleted file mode 100644 index 7ca7895e..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_13.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require opencl-clang.inc - -SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ - " -SRCREV = "0f36f940b25b8e7661cfaf8a7c11fdbb7d853223" - -BRANCH = "ocl-open-130" - -DEPENDS += " spirv-llvm-translator" - -EXTRA_OECMAKE += "\ - -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ - " 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 new file mode 100644 index 00000000..367ca7e9 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb @@ -0,0 +1,15 @@ +require opencl-clang.inc + +SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ + " +SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f" + +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} \ + " -- cgit v1.2.3-54-g00ecf