From d7b8c247227f3cc82f92292407f548927e9fde78 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 5 Mar 2012 13:01:21 -0800 Subject: base.bbclass: Fix PACKAGECONFIG handling when no flags are set When the main PACKAGECONFIG variable was empty with no flags set, the options were not being added to explicitly disable features. This patch corrects that problem and ensures the disable fields are correctly parsed and added to variables. Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes/base.bbclass') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 82dcda9aec..c8ed5447e4 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -302,8 +302,9 @@ python () { # # PACKAGECONFIG ?? = "" # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends" - pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() - if pkgconfig: + pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} + if pkgconfigflags: + pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() def appendVar(varname, appends): if not appends: return @@ -313,7 +314,7 @@ python () { extradeps = [] extrardeps = [] extraconf = [] - for flag, flagval in (d.getVarFlags("PACKAGECONFIG") or {}).items(): + for flag, flagval in pkgconfigflags.items(): if flag == "defaultval": continue items = flagval.split(",") -- cgit v1.2.3