On Mon, 2022-08-15 at 16:37 +0000, Peter Kjellerstedt wrote: > > -----Original Message----- > > From: [email protected] <openembedded- > > [email protected]> On Behalf Of Richard Purdie > > Sent: den 13 augusti 2022 22:35 > > To: [email protected] > > Subject: [OE-core] [PATCH 4/5] bitbake.conf: Handle S and B separately for > > debug mapping > > > > We don't really need to keep S and B separate for debug source purposes > > and there shouldn't be source references in WORKDIR that isn't S and B > > either. > > > > Separating these out simplifies the shared-work directory handling for > > gcc and should also help fix external source usage. Therefore handle > > S and B in DEBUG_PREFIX_MAP separately and clean up other code. > > > > Signed-off-by: Richard Purdie <[email protected]> > > --- > > meta/conf/bitbake.conf | 11 +++++++---- > > meta/recipes-devtools/gcc/gcc-runtime.inc | 13 ------------- > > meta/recipes-devtools/gcc/libgcc-common.inc | 8 -------- > > 3 files changed, 7 insertions(+), 25 deletions(-) > > > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > > index bdfb6784371..dd2df8a5520 100644 > > --- a/meta/conf/bitbake.conf > > +++ b/meta/conf/bitbake.conf > > @@ -645,10 +645,13 @@ EXTRA_OEMAKE:prepend:task-install = > > "${PARALLEL_MAKEINST} " > > # Optimization flags. > > ################################################################## > > # Beware: applied last to first > > -DEBUG_PREFIX_MAP ?= > > "-fmacro-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > > - > > -fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > > - -fdebug-prefix-map=${STAGING_DIR_HOST}= \ > > - -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ > > +DEBUG_PREFIX_MAP ?= > > "-fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > > + -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > > + -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > > + -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > > + -fdebug-prefix-map=${STAGING_DIR_HOST}= \ > > + -fmacro-prefix-map=${STAGING_DIR_HOST}= \ > > + -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ > > " > > That should be: > > DEBUG_PREFIX_MAP ?= " \ > -fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ > -fdebug-prefix-map=${STAGING_DIR_HOST}= \ > -fmacro-prefix-map=${STAGING_DIR_HOST}= \ > -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ > " > > to follow common variable indentation.
I should have mentioned this in the commit message but this was deliberate. It avoids a ton of whitespace in the compiler commandline which I think overrides the indentation standard give how commonly it is used. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169357): https://lists.openembedded.org/g/openembedded-core/message/169357 Mute This Topic: https://lists.openembedded.org/mt/93006715/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
