summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-14 17:24:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-15 12:27:01 +0100
commit11d5f2ce25152c1d9023c274f63038fd74314d80 (patch)
treef00a81789357a7fc4a554c058093d91b241cc28c
parent82b6078a63be56dfbdd733ef15b7280e1c684cd6 (diff)
downloadpoky-11d5f2ce25152c1d9023c274f63038fd74314d80.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: beb2a76c591e985c6fc7ed473abd1bee27f955a2) 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>
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-source.inc1
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 0f70be7dd4..2abc0e355d 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -96,7 +96,7 @@ BINV = "${PV}"
96#S = "${WORKDIR}/gcc-${PV}" 96#S = "${WORKDIR}/gcc-${PV}"
97S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" 97S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
98 98
99B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 99B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
100 100
101target_includedir ?= "${includedir}" 101target_includedir ?= "${includedir}"
102target_libdir ?= "${libdir}" 102target_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"
18DEPENDS = "" 18DEPENDS = ""
19PACKAGES = "" 19PACKAGES = ""
20 20
21B = "${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.
23python do_preconfigure () { 24python do_preconfigure () {