mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

base.bbclass: Fix PACKAGECONFIG handling when no flags are set

Browse Source 
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
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meta/classes/base.bbclass
View File

@@ -302,8 +302,9 @@ python () {
# #
# PACKAGECONFIG ?? = "<default options>" # PACKAGECONFIG ?? = "<default options>"
# PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends" # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends"
pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {}
if pkgconfig: if pkgconfigflags:
pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split()
def appendVar(varname, appends): def appendVar(varname, appends):
if not appends: if not appends:
return return
@@ -313,7 +314,7 @@ python () {
extradeps = [] extradeps = []
extrardeps = [] extrardeps = []
extraconf = [] extraconf = []
for flag, flagval in (d.getVarFlags("PACKAGECONFIG") or {}).items(): for flag, flagval in pkgconfigflags.items():
if flag == "defaultval": if flag == "defaultval":
continue continue
items = flagval.split(",") items = flagval.split(",")