| Message ID | 20250711160606.2208481-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/3] clang: move BPN assignment from common.inc | expand |
diff --git a/meta/recipes-devtools/clang/clang-cross-canadian_git.bb b/meta/recipes-devtools/clang/clang-cross-canadian_git.bb index 456c0d61bc5..0e84d3ac9a3 100644 --- a/meta/recipes-devtools/clang/clang-cross-canadian_git.bb +++ b/meta/recipes-devtools/clang/clang-cross-canadian_git.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception; SECTION = "devel" PN = "clang-cross-canadian-${TRANSLATED_TARGET_ARCH}" +BPN = "clang" require common-clang.inc require common-source.inc diff --git a/meta/recipes-devtools/clang/clang-cross_git.bb b/meta/recipes-devtools/clang/clang-cross_git.bb index 323cc0d8809..99e48522a0b 100644 --- a/meta/recipes-devtools/clang/clang-cross_git.bb +++ b/meta/recipes-devtools/clang/clang-cross_git.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception; SECTION = "devel" PN = "clang-cross-${TARGET_ARCH}" +BPN = "clang" require common-clang.inc require common-source.inc diff --git a/meta/recipes-devtools/clang/clang-crosssdk_git.bb b/meta/recipes-devtools/clang/clang-crosssdk_git.bb index ef162ef153f..234d4635784 100644 --- a/meta/recipes-devtools/clang/clang-crosssdk_git.bb +++ b/meta/recipes-devtools/clang/clang-crosssdk_git.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception; SECTION = "devel" PN = "clang-crosssdk-${SDK_SYS}" +BPN = "clang" require common-clang.inc require common-source.inc diff --git a/meta/recipes-devtools/clang/clang_git.bb b/meta/recipes-devtools/clang/clang_git.bb index 23dfbb5deb6..2b5d3a27524 100644 --- a/meta/recipes-devtools/clang/clang_git.bb +++ b/meta/recipes-devtools/clang/clang_git.bb @@ -17,6 +17,8 @@ SECTION = "devel" require common-clang.inc require common-source.inc +BPN = "clang" + INHIBIT_DEFAULT_DEPS:class-native = "1" LDFLAGS:append:class-target:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" diff --git a/meta/recipes-devtools/clang/common.inc b/meta/recipes-devtools/clang/common.inc index 37d37ec1975..a9d6f899c03 100644 --- a/meta/recipes-devtools/clang/common.inc +++ b/meta/recipes-devtools/clang/common.inc @@ -71,5 +71,3 @@ B ?= "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}" # The real WORKDIR location isn't a dependency for the shared workdir. src_patches[vardepsexclude] = "WORKDIR" should_apply[vardepsexclude] += "PN" - -BPN = "clang"
There's a BPN assignment in common.inc which means all recipes need to either be called clang, or set BPN themselves. Move the assignment to the clang recipes. For now I'm leaving the existing BPN assignments in the other recipes, in case there are complex multilib-related reasons to retain them. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-devtools/clang/clang-cross-canadian_git.bb | 1 + meta/recipes-devtools/clang/clang-cross_git.bb | 1 + meta/recipes-devtools/clang/clang-crosssdk_git.bb | 1 + meta/recipes-devtools/clang/clang_git.bb | 2 ++ meta/recipes-devtools/clang/common.inc | 2 -- 5 files changed, 5 insertions(+), 2 deletions(-)