From 537bc233f7a5955ae45d296aca394bd7e1565c60 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Thu, 15 Mar 2018 00:58:11 +0500
Subject: [PATCH] Various: leverage the tcmode overrides

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 .../systemd-boot/systemd-boot_%.bbappend      |  4 ++--
 .../glibc/glibc-locale_%.bbappend             | 20 +++++++++----------
 .../binutils/binutils-cross_%.bbappend        |  2 +-
 core/recipes-devtools/gdb/gdb_%.bbappend      |  9 ++++-----
 .../python/python3_%.bbappend                 |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/core/recipes-bsp/systemd-boot/systemd-boot_%.bbappend b/core/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
index 801492e..dbeb9c3 100644
--- a/core/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
+++ b/core/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
@@ -3,5 +3,5 @@
 # external toolchain.
 EFI_TUNE_ARCH = "-m32"
 EFI_TUNE_ARCH_x86-64 = "-m64"
-EFI_CC = "${@'${CC}'.split()[0]} ${EFI_TUNE_ARCH}"
-EXTRA_OECONF += "'EFI_CC=${EFI_CC}'"
+EFI_CC_tcmode-external = "${@'${CC}'.split()[0]} ${EFI_TUNE_ARCH}"
+EXTRA_OECONF_append_tcmode-external = " 'EFI_CC=${EFI_CC}'"
diff --git a/core/recipes-core/glibc/glibc-locale_%.bbappend b/core/recipes-core/glibc/glibc-locale_%.bbappend
index 2bb7f15..45c97e5 100644
--- a/core/recipes-core/glibc/glibc-locale_%.bbappend
+++ b/core/recipes-core/glibc/glibc-locale_%.bbappend
@@ -1,12 +1,12 @@
-require recipes-external/glibc/glibc-external-version.inc
-
-python () {
-    if d.getVar('TCMODE', True).startswith('external'):
-        d.setVar('INHIBIT_PACKAGE_DEBUG_SPLIT', '1')
-}
+INHIBIT_PACKAGE_DEBUG_SPLIT_tcmode-external = "1"
 
 # localedef needs libgcc & libc
-do_package[depends] += "${MLPREFIX}libgcc:do_packagedata virtual/${MLPREFIX}libc:do_packagedata"
-do_package_write_ipk[depends] += "${MLPREFIX}libgcc:do_packagedata virtual/${MLPREFIX}libc:do_packagedata"
-do_package_write_deb[depends] += "${MLPREFIX}libgcc:do_packagedata virtual/${MLPREFIX}libc:do_packagedata"
-do_package_write_rpm[depends] += "${MLPREFIX}libgcc:do_packagedata virtual/${MLPREFIX}libc:do_packagedata"
+localedef_depends_tcmode-external = "${MLPREFIX}libgcc:do_packagedata virtual/${MLPREFIX}libc:do_packagedata"
+
+python () {
+    depends = d.getVar('localedef_depends', True)
+    if depends:
+        for task in ['do_package', 'do_package_write_ipk', 'do_package_write_deb'
+                     'do_package_write_rpm']:
+            d.appendVarFlag(task, 'depends', ' ' + depends)
+}
diff --git a/core/recipes-devtools/binutils/binutils-cross_%.bbappend b/core/recipes-devtools/binutils/binutils-cross_%.bbappend
index bf7a1d5..4acd7dc 100644
--- a/core/recipes-devtools/binutils/binutils-cross_%.bbappend
+++ b/core/recipes-devtools/binutils/binutils-cross_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append () {
+do_install_append_tcmode-external () {
     install -d ${D}${bindir}/gcc
     for i in ${D}${bindir}/${TARGET_PREFIX}*; do
         ln -s ../$(basename "$i") ${D}${bindir}/gcc/${i##*/${TARGET_PREFIX}}
diff --git a/core/recipes-devtools/gdb/gdb_%.bbappend b/core/recipes-devtools/gdb/gdb_%.bbappend
index 7807745..227cd75 100644
--- a/core/recipes-devtools/gdb/gdb_%.bbappend
+++ b/core/recipes-devtools/gdb/gdb_%.bbappend
@@ -1,8 +1,7 @@
 PREFERRED_PROVIDER_gdbserver ?= "gdb"
-
-PROVIDES += "${@'gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' == '${PN}' else ''}"
+PROVIDES_append_tcmode-external = " ${@'gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' == '${PN}' else ''}"
 
 # Disable build of gdbserver if is provided by external-sourcery-toolchain
-PACKAGES := "${@oe.utils.str_filter_out('gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' != '${PN}' else '$', '${PACKAGES}', d)}"
-DISABLE_GDBSERVER := "${@'--disable-gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' != '${PN}' else ''}"
-EXTRA_OECONF += "${DISABLE_GDBSERVER}"
+PACKAGES_remove_tcmode-external = "${@'gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' != '${PN}' else ''}"
+DISABLE_GDBSERVER = "${@'--disable-gdbserver' if '${PREFERRED_PROVIDER_gdbserver}' != '${PN}' else ''}"
+EXTRA_OECONF_append_tcmode-external = " ${DISABLE_GDBSERVER}"
diff --git a/core/recipes-devtools/python/python3_%.bbappend b/core/recipes-devtools/python/python3_%.bbappend
index 0c479f8..8bb493b 100644
--- a/core/recipes-devtools/python/python3_%.bbappend
+++ b/core/recipes-devtools/python/python3_%.bbappend
@@ -1,3 +1,3 @@
 # This build relies on this matching up with HOST_PREFIX, as it doesn't seem
 # to use CROSS_COMPILE everywhere. Align it here to fix the build.
-HOST_SYS = "${@'${HOST_PREFIX}'[:-1]}"
+HOST_SYS_tcmode-external = "${@'${HOST_PREFIX}'[:-1]}"