diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-14 17:24:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-22 23:46:32 +0100 |
commit | d4c7b40039c79447069d8a3e6f8af4a10eeca474 (patch) | |
tree | 9239c445c0ae601fd995ba3f2cd4181108a0a5ed /meta/recipes-devtools/gcc | |
parent | a2805141e99d371002b3406d61dccbd2b2f18b8a (diff) | |
download | poky-d4c7b40039c79447069d8a3e6f8af4a10eeca474.tar.gz |
gcc-source: Fix incorrect task dependencies from ${B}
Some tasks may reference ${B} for gcc-source which in general would not exist.
It has dependencies on HOST_SYS and TARGET_SYS which are not appropriate for a
shared recipe like gcc-source. This causes problems for the archiver and
multiconfigs in particlar.
Set B to something else to avoid these task hash issues.
Acked-by: Jose Quaresma <jose.quaresma@foundries.io>
(From OE-Core rev: 14aa189c2e47a2c5a4a0099235a2605666651f74)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit beb2a76c591e985c6fc7ed473abd1bee27f955a2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-source.inc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 629fa26dfe..69a3536965 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc | |||
@@ -100,7 +100,7 @@ BINV = "${PV}" | |||
100 | #S = "${WORKDIR}/gcc-${PV}" | 100 | #S = "${WORKDIR}/gcc-${PV}" |
101 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" | 101 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" |
102 | 102 | ||
103 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" | 103 | B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" |
104 | 104 | ||
105 | target_includedir ?= "${includedir}" | 105 | target_includedir ?= "${includedir}" |
106 | target_libdir ?= "${libdir}" | 106 | target_libdir ?= "${libdir}" |
diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 03bab97815..224b7778ef 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc | |||
@@ -18,6 +18,7 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
18 | DEPENDS = "" | 18 | DEPENDS = "" |
19 | PACKAGES = "" | 19 | PACKAGES = "" |
20 | 20 | ||
21 | B = "${WORKDIR}/build" | ||
21 | 22 | ||
22 | # This needs to be Python to avoid lots of shell variables becoming dependencies. | 23 | # This needs to be Python to avoid lots of shell variables becoming dependencies. |
23 | python do_preconfigure () { | 24 | python do_preconfigure () { |