Hi Richard, I've seen that the patch is reverted in master-next. Was an issue discovered?
Étienne On Tue, Feb 18, 2025 at 4:22 PM Richard Purdie via lists.openembedded.org <[email protected]> wrote: > Firstly, just include xz support in all gdb configurations to simplify > config. > Most systems would already have the shared library so this isn't a big > problem > for a larger debugging tool. > > The PACKAGECONFIG duplication is also confusing. The only PACKAGECONFIG > which > needs special handking is the python one due to the differing modules > needed > in the nativesdk case. Remove all the other duplicate entries which should > work > through our usual class extension code. > > Signed-off-by: Richard Purdie <[email protected]> > --- > meta/recipes-devtools/gdb/gdb-common.inc | 4 +--- > meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 6 +----- > meta/recipes-devtools/gdb/gdb-cross.inc | 4 ---- > 3 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/meta/recipes-devtools/gdb/gdb-common.inc > b/meta/recipes-devtools/gdb/gdb-common.inc > index ea1fc27a61b..c0312f0f05c 100644 > --- a/meta/recipes-devtools/gdb/gdb-common.inc > +++ b/meta/recipes-devtools/gdb/gdb-common.inc > @@ -30,9 +30,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-x > --disable-werror \ > --with-libgmp-prefix=${STAGING_EXECPREFIXDIR} \ > " > > -PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', > 'debuginfod', d)} python \ > - ${@bb.utils.contains('DISTRO_FEATURES', > 'minidebuginfo', 'xz', '', d)} \ > - " > +PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', > 'debuginfod', d)} python xz" > # Use --without-system-readline to compile with readline 5. > PACKAGECONFIG[readline] = > "--with-system-readline,--without-system-readline,readline" > PACKAGECONFIG[python] = > "--with-python=${WORKDIR}/python,--without-python,python3,python3-codecs" > diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc > b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc > index 9150c196a85..7b4a7719e44 100644 > --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc > +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc > @@ -12,13 +12,9 @@ DEPENDS = "nativesdk-ncurses nativesdk-expat > nativesdk-gettext nativesdk-gmp nat > GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" > > # Overrides PACKAGECONFIG variables in gdb-common.inc > -PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', > 'debuginfod', d)}" > PACKAGECONFIG[python] = > "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \ > nativesdk-python3-core \ > - nativesdk-python3-codecs > nativesdk-python3-netclient \ > - " > -PACKAGECONFIG[readline] = > "--with-system-readline,--without-system-readline,nativesdk-readline" > -PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, > nativesdk-elfutils" > + nativesdk-python3-codecs > nativesdk-python3-netclient" > > SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_DATADIR}/gdb" > > diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc > b/meta/recipes-devtools/gdb/gdb-cross.inc > index 399f4bba97a..110a536db72 100644 > --- a/meta/recipes-devtools/gdb/gdb-cross.inc > +++ b/meta/recipes-devtools/gdb/gdb-cross.inc > @@ -4,11 +4,7 @@ DEPENDS = "expat-native gmp-native mpfr-native > ncurses-native flex-native bison- > > inherit python3native pkgconfig > > -# Overrides PACKAGECONFIG variables in gdb-common.inc > -PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', > 'debuginfod', d)}" > PACKAGECONFIG[python] = > "--with-python=${PYTHON},--without-python,python3-native" > -PACKAGECONFIG[readline] = > "--with-system-readline,--without-system-readline,readline-native" > -PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, > elfutils-native" > > do_compile:prepend() { > export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#211632): https://lists.openembedded.org/g/openembedded-core/message/211632 Mute This Topic: https://lists.openembedded.org/mt/111252056/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
