From 953591e89fba92501cf421adf448aa69caa12e14 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 30 Jul 2021 17:01:51 +0200
Subject: Manually finish conversion

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 README.md                  | 2 +-
 classes/clang.bbclass      | 8 ++++----
 classes/scan-build.bbclass | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 698ae3a..7be4ada 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ and OE will start using gcc to cross compile that recipe.
 if a component does not build with libc++, you can add it to `conf/nonclangable.inc` e.g.
 
 ```shell
-CXX:remove:pn-<recipe>_toolchain-clang = " -stdlib=libc++ "
+CXX:remove:pn-<recipe>:toolchain-clang = " -stdlib=libc++ "
 ```
 
 # compiler-rt failing in do_configure with custom TARGET_VENDOR
diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index 8825c15..920150a 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -71,7 +71,7 @@ LDFLAGS:append:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is
 TOOLCHAIN ??= "gcc"
 # choose between 'gnu' 'llvm'
 RUNTIME ??= "gnu"
-#RUNTIME_toolchain-gcc = "gnu"
+#RUNTIME:toolchain-gcc = "gnu"
 RUNTIME:armeb = "gnu"
 
 TOOLCHAIN:class-native = "gcc"
@@ -84,8 +84,8 @@ OVERRIDES =. "${@['', 'toolchain-${TOOLCHAIN}:']['${TOOLCHAIN}' != '']}"
 OVERRIDES =. "${@['', 'runtime-${RUNTIME}:']['${RUNTIME}' != '']}"
 OVERRIDES[vardepsexclude] += "TOOLCHAIN RUNTIME"
 
-#DEPENDS_append_toolchain-clang:class-target = " clang-cross-${TARGET_ARCH} "
-#DEPENDS_remove_toolchain-clang_allarch = "clang-cross-${TARGET_ARCH}"
+#DEPENDS:append:toolchain-clang:class-target = " clang-cross-${TARGET_ARCH} "
+#DEPENDS:remove:toolchain-clang:allarch = "clang-cross-${TARGET_ARCH}"
 
 def clang_base_deps(d):
     if not d.getVar('INHIBIT_DEFAULT_DEPS', False):
@@ -111,7 +111,7 @@ def clang_base_deps(d):
 BASE_DEFAULT_DEPS:toolchain-clang:class-target = "${@clang_base_deps(d)}"
 BASE_DEFAULT_DEPS:append:class-native:toolchain-clang_runtime-llvm = " libcxx-native compiler-rt-native"
 
-cmake_do_generate_toolchain_file_append_toolchain-clang () {
+cmake_do_generate_toolchain_file:append:toolchain-clang () {
     cat >> ${WORKDIR}/toolchain.cmake <<EOF
 set( CMAKE_CLANG_TIDY ${HOST_PREFIX}clang-tidy )
 EOF
diff --git a/classes/scan-build.bbclass b/classes/scan-build.bbclass
index 2494ccd..2aab86a 100644
--- a/classes/scan-build.bbclass
+++ b/classes/scan-build.bbclass
@@ -17,7 +17,7 @@ SCAN_RESULTS_DIR ?= "${TMPDIR}/static-scan/${PN}"
 
 CCSCAN ?= "${HOST_PREFIX}${TOOLCHAIN}"
 CXXSCAN:toolchain-clang ?= "${HOST_PREFIX}clang++"
-CXXSCAN_toolchain-gcc ?= "${HOST_PREFIX}g++"
+CXXSCAN:toolchain-gcc ?= "${HOST_PREFIX}g++"
 
 do_scanbuild() {
         rm -rf ${SCAN_RESULTS_DIR}
-- 
cgit v1.2.3-54-g00ecf