From: Christopher Larson <kergoth@gmail.com>
Date: Wed, 23 Oct 2013 20:47:27 +0000 (-0700)
Subject: base.bbclass: fix nondeterministic PACKAGECONFIG processing order
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=754e8768b69acba89bd6c3ba5dbe55b9df4d8083;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

base.bbclass: fix nondeterministic PACKAGECONFIG processing order

The PACKAGECONFIG flags were iterated over using dict.items(), but this
returns the items in an undefined order. As this order determines the
EXTRA_OECONF append order, we can get EXTRA_OECONF which are functionally
equivalent, but whose contents differ, resulting in not using shared state
archives we should be using.

(From OE-Core rev: 843a5dd8f8f0461e286d9fdb3ba55205b4275f88)

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index dfa580c5833..93bc700a500 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -433,7 +433,7 @@ python () {
         extradeps = []
         extrardeps = []
         extraconf = []
-        for flag, flagval in pkgconfigflags.items():
+        for flag, flagval in sorted(pkgconfigflags.items()):
             if flag == "defaultval":
                 continue
             items = flagval.split(",")