From 3a31fc4166c6e0b337007545554412637b859de0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 24 May 2024 20:05:06 -0700 Subject: [PATCH] clang-common: Rename task add_distro_vendor -> do_preconfigure Move the dependency anchor to do_preconfigure instead of do_patch since do_patch may get deleted when using devtool etc. so it helps with working on developing clang using devtool Signed-off-by: Khem Raj --- recipes-devtools/clang/common-source.inc | 4 ++-- recipes-devtools/clang/llvm-project-source.inc | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes-devtools/clang/common-source.inc b/recipes-devtools/clang/common-source.inc index cd95453f..d8a0f681 100644 --- a/recipes-devtools/clang/common-source.inc +++ b/recipes-devtools/clang/common-source.inc @@ -7,9 +7,9 @@ deltask do_patch SRC_URI = "" -do_configure[depends] += "llvm-project-source-${PV}:do_patch" +do_configure[depends] += "llvm-project-source-${PV}:do_preconfigure" do_populate_lic[depends] += "llvm-project-source-${PV}:do_unpack" -do_create_spdx[depends] += "llvm-project-source-${PV}:do_patch" +do_create_spdx[depends] += "llvm-project-source-${PV}:do_preconfigure" # spdx shared workdir detection fails as not WORKDIR is altered but S and B # return always true to fix that diff --git a/recipes-devtools/clang/llvm-project-source.inc b/recipes-devtools/clang/llvm-project-source.inc index 103373a3..84d827c0 100644 --- a/recipes-devtools/clang/llvm-project-source.inc +++ b/recipes-devtools/clang/llvm-project-source.inc @@ -34,7 +34,8 @@ CLANG_EXTRA_OE_VENDORS ?= "${TARGET_VENDOR} ${SDK_VENDOR}" CLANG_EXTRA_OE_DISTRO ?= "poky:poky" # Match with MULTILIB_GLOBAL_VARIANTS MULTILIB_VARIANTS = "lib32 lib64 libx32" -python add_distro_vendor() { + +python do_preconfigure() { import subprocess case = "" triple = "" @@ -92,5 +93,5 @@ python add_distro_vendor() { } do_patch[vardepsexclude] = "MULTILIBS" -do_patch[postfuncs] += "add_distro_vendor" -do_create_spdx[depends] += "${PN}:do_patch" +addtask do_preconfigure after do_patch +do_create_spdx[depends] += "${PN}:do_preconfigure"