From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 14 Dec 2012 16:25:52 +0000 (+0000)
Subject: data: Ensure emit_func honours vardeps flag
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a906c94328b040d5076571bd593b57be7ee403a5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

data: Ensure emit_func honours vardeps flag

Currently, calling a shell function using exec_func may result in
dependent functions being missing, if the shell parser can't detect
the dependency, even if it was specified with the vardeps flag.

This patch ensures the function looks at the flag and considers it
when deciding which other functions need to be output.

[YOCTO #3561]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/data.py b/lib/bb/data.py
index dc5a425d1c7..478a482d881 100644
--- a/lib/bb/data.py
+++ b/lib/bb/data.py
@@ -260,6 +260,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
 
     emit_var(func, o, d, False) and o.write('\n')
     newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True))
+    newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split())
     seen = set()
     while newdeps:
         deps = newdeps