diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/utils.bbclass | 7 | ||||
| -rw-r--r-- | meta/lib/oe/utils.py | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 8e07eac07a..32cae7e312 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -364,12 +364,7 @@ def multilib_pkg_extend(d, pkg): return pkgs def get_multilib_datastore(variant, d): - localdata = bb.data.createCopy(d) - overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant - localdata.setVar("OVERRIDES", overrides) - localdata.setVar("MLPREFIX", variant + "-") - return localdata -get_multilib_datastore[vardepsexclude] = "OVERRIDES" + return oe.utils.get_multilib_datastore(variant, d) def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '): """Return a string of all ${var} in all multilib tune configuration""" diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 1897c5faea..7a79d752b6 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -281,6 +281,14 @@ def host_gcc_version(d): version = match.group(1) return "-%s" % version if version in ("4.8", "4.9") else "" + +def get_multilib_datastore(variant, d): + localdata = bb.data.createCopy(d) + overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant + localdata.setVar("OVERRIDES", overrides) + localdata.setVar("MLPREFIX", variant + "-") + return localdata + # # Python 2.7 doesn't have threaded pools (just multiprocessing) # so implement a version here |