[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3435/8267] Revert "classes/populate_sdk_ext: require uninative"

[Emmanuele Bassi <ebassi src gnome org>]

commit 71b7c3a88ec5a20d5e4531751d0bf23d5c94e494
Author: Ross Burton <ross burton intel com>
Date:   Tue Nov 22 15:57:54 2016 +0000

    Revert "classes/populate_sdk_ext: require uninative"
    
    The change to move C++ ABI tweaks to bitbake.conf should make this redundant, so
    revert it.
    
    This reverts commit c56cd49a12645e82d0a16bb94be16ac509f8813c.
    
    (From OE-Core rev: af280990bff4a484fd8a18e3442b56a0a39b7611)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_ext.bbclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 0e3656b..3c3a73c 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -114,6 +114,10 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath):
             f.write('SSTATE_MIRRORS_forcevariable = ""\n')
             # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it
             f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n')
+            # Drop uninative if the build isn't using it (or else NATIVELSBSTRING will
+            # be different and we won't be able to find our native sstate)
+            if not bb.data.inherits_class('uninative', d):
+                f.write('INHERIT_remove = "uninative"\n')
 
         # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake
         # will not allow in its COREBASE path, so we need to rename the directory temporarily
@@ -609,9 +613,6 @@ fakeroot python do_populate_sdk_ext() {
     if d.getVar('SDK_ARCH', True) != d.getVar('BUILD_ARCH', True):
         bb.fatal('The extensible SDK can currently only be built for the same architecture as the machine 
being built on - SDK_ARCH is set to %s (likely via setting SDKMACHINE) which is different from the 
architecture of the build machine (%s). Unable to continue.' % (d.getVar('SDK_ARCH', True), 
d.getVar('BUILD_ARCH', True)))
 
-    if not bb.data.inherits_class('uninative', d):
-        bb.fatal('The extensible SDK requires uninative to be enabled. Enabling this is straightforward - 
just add the following to your configuration:\n\nrequire 
meta/conf/distro/include/yocto-uninative.inc\nINHERIT += "uninative"\n')
-
     d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d))
     buildtools_fn = get_current_buildtools(d)
     d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))