From ebdbd105efb68bd4c68b5701927e51a3a676859a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 18 Feb 2025 10:12:51 +0000 Subject: gdb: Include xz support by default and clean up PACKAGECONFIG 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. (From OE-Core rev: d6eefdd66171c2bcdeeebc8a9b583c5383c80bf6) Signed-off-by: Richard Purdie --- 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 ea1fc27a61..c0312f0f05 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 9150c196a8..7b4a7719e4 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 399f4bba97..110a536db7 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}" -- cgit v1.2.3-54-g00ecf