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>
This commit is contained in:
Richard Purdie
2012-03-05 13:01:21 -08:00
parent 9195e9670e
commit a8dc76ee69

View File

@@ -302,8 +302,9 @@ python () {
#
# PACKAGECONFIG ?? = "<default options>"
# 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(",")