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 <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/clang/clang-cross-canadian_git.bb b/meta/recipes-devtools/clang/clang-cross-canadian_git.bb
index 456c0d61bc560ee131e06fd37eb434ab366b1861..0e84d3ac9a39b5622d95b8dd9314f341ce2137b7 100644 (file)
--- 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 323cc0d88097b1714f8e6bb0606fa8363cb8c657..99e48522a0b0feb09b90e035a117cda067ca8f1b 100644 (file)
--- 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 ef162ef153f2c497ea5bdae2b0df1ee7c3730b21..234d4635784cd56486752f9b30351c123a5962cf 100644 (file)
--- 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 23dfbb5deb626d40184e6d190310fef4c7fb176f..2b5d3a275249fb153f9cf8da4a8c10d094e21264 100644 (file)
--- 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 37d37ec1975e8a7f9ddfb24b399098207236da3a..a9d6f899c03d0041ee0308a1f522cc6fd51a387b 100644 (file)
--- 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"