Skip to contentSkip to conversation

gdb/systemd: enable minidebuginfo support conditionally

PATCH Superseded [email protected] 1 participant 1 message Nov 30, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gdb/systemd: enable minidebuginfo support conditionally

From: Etienne Cordonnier <[email protected]>

Enabling minidebuginfo is not useful if gdb and systemd-coredump are unable to parse it.

In order to parse it, gdb needs xz support. Systemd needs coredump enabled, as
well as elfutil enabled as well (systemd-coredump loads libdw which is part of elfutils using dlopen).

---
 meta/recipes-core/systemd/systemd_254.4.bb       | 1 +
 meta/recipes-devtools/elfutils/elfutils_0.189.bb | 3 ++-
 meta/recipes-devtools/gdb/gdb-common.inc         | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd_254.4.bb +1 -0
index ecf693ef92..f3e56bf94c 100644
@@ -70,6 +70,7 @@ PACKAGECONFIG ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', 'link-udev-shared', d)} \
+    ${@'coredump elfutils' if d.getVar('PACKAGE_MINIDEBUGINFO') == '1' else ''} \
     backlight \
     binfmt \
     gshadow \
meta/recipes-devtools/elfutils/elfutils_0.189.bb +2 -1
index d8bf82b022..4f097e5b5c 100644
@@ -39,7 +39,8 @@ BUILD_CFLAGS += "-Wno-error=stringop-overflow"
 DEPENDS_BZIP2 = "bzip2-replacement-native"
 DEPENDS_BZIP2:class-target = "bzip2"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'debuginfod', 'debuginfod libdebuginfod', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'debuginfod', 'debuginfod libdebuginfod', '', d)} \
+                   ${@'xz' if d.getVar('PACKAGE_MINIDEBUGINFO') == '1' else ''}"
 PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}"
 PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz"
 PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
meta/recipes-devtools/gdb/gdb-common.inc +2 -1
index 3349719a6b..c444af62b3 100644
@@ -30,7 +30,8 @@ EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \
                 --with-libgmp-prefix=${STAGING_EXECPREFIXDIR} \
 "
 
-PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)} python"
+PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)} python \
+                   ${@'xz' if d.getVar('PACKAGE_MINIDEBUGINFO') == '1' else ''}"
 # 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"
Signature · 1 line
2.36.1.vfs.0.0