From fc7e8c3e5c19a1885bec564c8fc07df5a13c8bd4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Jul 2025 16:51:34 +0100 Subject: [PATCH] clang: move BPN assignment from common.inc 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 Signed-off-by: Richard Purdie --- 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(-) diff --git a/meta/recipes-devtools/clang/clang-cross-canadian_git.bb b/meta/recipes-devtools/clang/clang-cross-canadian_git.bb index 456c0d61bc..0e84d3ac9a 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 323cc0d880..99e48522a0 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 ef162ef153..234d463578 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 23dfbb5deb..2b5d3a2752 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 37d37ec197..a9d6f899c0 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" -- 2.47.2