diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-12 11:34:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-14 11:42:18 +0000 |
commit | 9c8fee9c62beaffa930c4b26dea70a4be5a66780 (patch) | |
tree | 842d56ca15c34869d7c6bed551a7c94d60690ed4 | |
parent | 971fafba6a04531acc73ed348f04a6315be6d0ef (diff) | |
download | poky-9c8fee9c62beaffa930c4b26dea70a4be5a66780.tar.gz |
autotools: Correct dependency search logic error
We go to the effort of finding the value of start, we should then use it
rather than relying on the value of dep being preserved from the previous
loop. Took me far too long to notice this issue when changing the code.
Also drop an unused variable.
(From OE-Core rev: c546cced50ce8b72fe55f9a7cfe7fdb23c51d1ad)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/autotools.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index abbc782549..a5f2bff1ab 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass | |||
@@ -160,8 +160,8 @@ python autotools_copy_aclocals () { | |||
160 | # We need to find configure tasks which are either from <target> -> <target> | 160 | # We need to find configure tasks which are either from <target> -> <target> |
161 | # or <native> -> <native> but not <target> -> <native> unless they're direct | 161 | # or <native> -> <native> but not <target> -> <native> unless they're direct |
162 | # dependencies. This mirrors what would get restored from sstate. | 162 | # dependencies. This mirrors what would get restored from sstate. |
163 | done = [dep] | 163 | done = [start] |
164 | next = [dep] | 164 | next = [start] |
165 | while next: | 165 | while next: |
166 | new = [] | 166 | new = [] |
167 | for dep in next: | 167 | for dep in next: |
@@ -188,7 +188,6 @@ python autotools_copy_aclocals () { | |||
188 | #bb.warn(str(configuredeps2)) | 188 | #bb.warn(str(configuredeps2)) |
189 | 189 | ||
190 | cp = [] | 190 | cp = [] |
191 | siteconf = [] | ||
192 | for c in configuredeps: | 191 | for c in configuredeps: |
193 | if c.endswith("-native"): | 192 | if c.endswith("-native"): |
194 | manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c) | 193 | manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c) |