[oe-commits] Richard Purdie : base.bbclass: Fix PACKAGECONFIG handling when no flags are set

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d7b8c247227f3cc82f92292407f548927e9fde78
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d7b8c247227f3cc82f92292407f548927e9fde78

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Mar  5 13:01:21 2012 -0800

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 <richard.purdie at linuxfoundation.org>

---

 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 82dcda9..c8ed544 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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(",")