summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 13:01:21 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 13:04:11 -0800
commita8dc76ee69cfe1ffe846c07a510e3a562a5b1a7f (patch)
tree350733eb720525accff6af9adc6f2238c1ba4780 /meta/classes
parent9195e9670eac85151f3856eea65bc9c4cbe73232 (diff)
downloadpoky-a8dc76ee69cfe1ffe846c07a510e3a562a5b1a7f.tar.gz
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. (From OE-Core rev: d7b8c247227f3cc82f92292407f548927e9fde78) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass7
1 files changed, 4 insertions, 3 deletions
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 () {
302 # 302 #
303 # PACKAGECONFIG ?? = "<default options>" 303 # PACKAGECONFIG ?? = "<default options>"
304 # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends" 304 # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends"
305 pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() 305 pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {}
306 if pkgconfig: 306 if pkgconfigflags:
307 pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split()
307 def appendVar(varname, appends): 308 def appendVar(varname, appends):
308 if not appends: 309 if not appends:
309 return 310 return
@@ -313,7 +314,7 @@ python () {
313 extradeps = [] 314 extradeps = []
314 extrardeps = [] 315 extrardeps = []
315 extraconf = [] 316 extraconf = []
316 for flag, flagval in (d.getVarFlags("PACKAGECONFIG") or {}).items(): 317 for flag, flagval in pkgconfigflags.items():
317 if flag == "defaultval": 318 if flag == "defaultval":
318 continue 319 continue
319 items = flagval.split(",") 320 items = flagval.split(",")