From 9a32eca022ece59a799a94d54d350cdc5a13eef1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Sep 2013 07:53:40 +0000 Subject: [PATCH] bitbake: data: Optimise flag lookup in build_dependencies When looking up flag variable dependencies, large chunks of the function aren't needed. Optimise the function flow accordingly for speed. (Bitbake rev: 1bf3aee698ad35f6815ea2c75471a96511a29d55) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 876f6ca542..49bb5e997d 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -291,10 +291,13 @@ def build_dependencies(key, keys, shelldeps, vardepvals, d): if key[-1] == ']': vf = key[:-1].split('[') value = d.getVarFlag(vf[0], vf[1], False) - else: - value = d.getVar(key, False) + parser = d.expandWithRefs(value, key) + deps |= parser.references + deps = deps | (keys & parser.execs) + return deps, value varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude"]) or {} vardeps = varflags.get("vardeps") + value = d.getVar(key, False) if "vardepvalue" in varflags: value = varflags.get("vardepvalue")