summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2015-09-19 22:19:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-21 23:05:42 +0100
commite6d4f8198a8708f54fc17333ae643b51ed9100b6 (patch)
tree05f233d42ccc6d60b6bb1379d91f8f72a6947f7e
parentf4d7f7075b3da1a3a37d6bb3e19613e7a068a63c (diff)
downloadopenembedded-core-contrib-e6d4f8198a8708f54fc17333ae643b51ed9100b6.tar.gz
openembedded-core-contrib-e6d4f8198a8708f54fc17333ae643b51ed9100b6.tar.bz2
openembedded-core-contrib-e6d4f8198a8708f54fc17333ae643b51ed9100b6.zip
autotools: fix traversal bug in aclocal copying
The logic is supposed to avoid following dependencies when we depend on a target recipe which depends on a native recipe. The problem is, we were marking the dep (the native recipe) as already processed when we avoided traversal, meaning that even when that recipe would be pulled in via a different dependency, we skipped it there too, and whether it was skipped entirely depended on the non-deterministic dep processing order. If the first one to be encountered was via the indirect target dep, it wouldn't end up in configuredeps, otherwise it would. As we want to avoid traversing that particular dependency relationship, not *every* dependency on the native, we should continue, but not add it to done, so it can be traversed from other avenues. This fixes an intermittent bug in some of my non-GPLv3 builds, where one dependency upon gettext-minimal-native was skipped, but others should not have been, resulting in it being removed from configuredeps entirely, and no gettext macros being available. Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/autotools.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 819045a3b4..078f58fad3 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -168,9 +168,9 @@ python autotools_copy_aclocals () {
for datadep in data[3]:
if datadep in done:
continue
- done.append(datadep)
if (not data[0].endswith("-native")) and taskdepdata[datadep][0].endswith("-native") and dep != start:
continue
+ done.append(datadep)
new.append(datadep)
if taskdepdata[datadep][1] == "do_configure":
configuredeps.append(taskdepdata[datadep][0])