gcc/clang: set S to be in UNPACKDIR

This and some further commits allows removing the 'backwards
compatibility magic' in do_unpack that moves unpacked sources
to where S is set to.

(From OE-Core rev: 6b2f14cd2d110113f1065bdc818ec4e9dbd4b054)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2025-06-16 11:49:54 +02:00 committed by Richard Purdie
parent fc0f1b61c6
commit 910442fedc
4 changed files with 8 additions and 5 deletions

View File

@ -63,7 +63,8 @@ SRC_URI = "\
# Fallback to no-PIE if not set
GCCPIE ??= ""
S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/${SOURCEDIR}"
UNPACKDIR = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/sources"
S = "${UNPACKDIR}/${SOURCEDIR}"
B ?= "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
# We need to ensure that for the shared work directory, the do_patch signatures match

View File

@ -75,7 +75,8 @@ SRC_URI = "${BASEURI} \
file://0026-fix-incorrect-preprocessor-line-numbers.patch \
"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
UNPACKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/sources"
S = "${UNPACKDIR}/${SOURCEDIR}"
B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
# Language Overrides

View File

@ -104,7 +104,8 @@ MIRRORS =+ "\
gcclibdir = "${libdir}/gcc"
BINV = "${PV}"
#S = "${WORKDIR}/gcc-${PV}"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
UNPACKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/sources"
S = "${UNPACKDIR}/gcc-${PV}"
B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"

View File

@ -16,6 +16,6 @@ do_deploy_source_date_epoch () {
sde_file=${SDE_FILE}
sde_file=${sde_file#${WORKDIR}/}
mkdir -p ${SDE_DEPLOYDIR} $(dirname ${SDE_FILE})
cp -p $(dirname ${S})/$sde_file ${SDE_DEPLOYDIR}
cp -p $(dirname ${S})/$sde_file ${SDE_FILE}
cp -p $(dirname ${UNPACKDIR})/$sde_file ${SDE_DEPLOYDIR}
cp -p $(dirname ${UNPACKDIR})/$sde_file ${SDE_FILE}
}