diff options
| -rw-r--r-- | meta/classes/base.bbclass | 7 |
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(",") |
