From 9aecbb76e8a4404dc01e0d6cdf654d4998198c96 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 26 Mar 2021 18:39:13 +0800 Subject: llvm-project-source: exclude for llvm-12 meta-clang now builds llvm-spiv-translator as an external project for llvm12 so stop building it. It still need to be built for llvm-10 and llvm-11 though. Ref: https://github.com/kraj/meta-clang/commit/aa1ab889bcbb580f33151933d7ed44fd4a93f1bf Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../recipes-devtools/clang/llvm-project-source.bbappend | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend index fb87900e..17e991ab 100644 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend @@ -18,10 +18,10 @@ SRC_URI_LLVM11 = " \ file://llvm11-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ " -SRC_URI_append_intel-x86-common = " \ - git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=${SPIRV_BRANCH};destsuffix=git/llvm/projects/llvm-spirv;name=spirv \ - " +SPIRV_LLVM_SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=${SPIRV_BRANCH};destsuffix=git/llvm/projects/llvm-spirv;name=spirv" -SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '${SRC_URI_LLVM10}', '${SRC_URI_LLVM11}', d)}" +SPIRV_LLVM_PATCHES = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '${SRC_URI_LLVM10}', '${SRC_URI_LLVM11}', d)}" -SRCREV_spirv = "${SPIRV_SRCREV}" + +SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', '', ' ${SPIRV_LLVM_SRC_URI} ${SPIRV_LLVM_PATCHES} ', d)}" +SRCREV_spirv = "${@bb.utils.contains('LLVMVERSION', '12.0.0', '', '${SPIRV_SRCREV}', d)}" -- cgit v1.2.3-54-g00ecf