Skip to content

Rework ELF symbol decompression enablement #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Rework ELF symbol decompression enablement #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85198ec
configure,src/common/linux/dump_symbols: make possible to disable dec…
illwieckz Oct 20, 2026
4a4ec0c
m4: copy pkg.m4 frrom pkgconf 1.8.1
illwieckz Oct 21, 2026
95a1356
makefile,configure: rework the zstd enablement
illwieckz Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,12 +723,13 @@ src_tools_linux_dump_syms_dump_syms_SOURCES = \
src/tools/linux/dump_syms/dump_syms.cc
src_tools_linux_dump_syms_dump_syms_CXXFLAGS = \
$(RUSTC_DEMANGLE_CFLAGS) \
$(ZSTD_CFLAGS)
$(ZSTD_CFLAGS) \
$(ZLIB_CFLAGS)
src_tools_linux_dump_syms_dump_syms_LDADD = \
$(RUSTC_DEMANGLE_LIBS) \
$(ZSTD_CFLAGS) \

@illwieckz illwieckz Oct 21, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot to mention it, but that also fixes that mistakes of those CFLAGS used instead of linker flags .

$(SOCKET_LIBS) \
-lz
$(SOCKET_LIBS) \
$(ZSTD_LIBS) \
$(ZLIB_LIBS)

src_tools_linux_md2core_minidump_2_core_SOURCES = \
src/common/linux/memory_mapped_file.cc \
Expand Down
81 changes: 74 additions & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,17 +256,84 @@ fi
AC_ARG_VAR([RUSTC_DEMANGLE_CFLAGS], [Compiler flags for rustc-demangle])
AC_ARG_VAR([RUSTC_DEMANGLE_LIBS], [Linker flags for rustc-demangle])

AC_ARG_ENABLE(zstd,
AS_HELP_STRING([--enable-zstd],
[Enable decompression of ELF sections with zstd]),,
PKG_PROG_PKG_CONFIG

AC_ARG_ENABLE([zlib],
[AS_HELP_STRING([--disable-zlib],
[Disable decompression of ELF sections with zlib])],
[enable_zlib=$enableval],
[enable_zlib=yes])

if test "x${enable_zlib}" = "xyes"; then
have_zlib=no
ZLIB_CFLAGS=""
ZLIB_LIBS=""

AC_CHECK_LIB([z], [uncompress],
[have_zlib=yes
ZLIB_LIBS="-lz"],
[have_zlib=no])

if test "x${have_zlib}" != "xyes"; then
PKG_CHECK_MODULES([ZLIB], [libz],
[have_zlib=yes],
[have_zlib=no])
fi

if test "x${have_zlib}" != "xyes"; then
AC_MSG_ERROR([zlib library not found.])
fi

save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
AC_CHECK_HEADER([zlib.h], [],
[AC_MSG_ERROR([zlib header not found.])])
CPPFLAGS="$save_CPPFLAGS"
fi

AC_SUBST([ZLIB_CFLAGS])
AC_SUBST([ZLIB_LIBS])
AM_CONDITIONAL([ENABLE_ZLIB], [test "x${enable_zlib}" = "xyes"])

PKG_PROG_PKG_CONFIG

AC_ARG_ENABLE([zstd],
[AS_HELP_STRING([--enable-zstd],
[Enable decompression of ELF sections with zstd])],
[enable_zstd=$enableval],
[enable_zstd=no])
if test "x${enable_zstd}" != xno; then
AC_CHECK_LIB(zstd, ZSTD_decompress, [],
[AC_MSG_ERROR([zstd library not found.])])
AC_CHECK_HEADER(zstd.h, [],

if test "x${enable_zstd}" = "xyes"; then
have_zstd=no
ZSTD_CFLAGS=""
ZSTD_LIBS=""

AC_CHECK_LIB([zstd], [ZSTD_decompress],
[have_zstd=yes
ZSTD_LIBS="-lzstd"],
[have_zstd=no])

if test "x${have_zstd}" != "xyes"; then
PKG_CHECK_MODULES([ZSTD], [libzstd],
[have_zstd=yes],
[have_zstd=no])
fi

if test "x${have_zstd}" != "xyes"; then
AC_MSG_ERROR([zstd library not found.])
fi

save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS"
AC_CHECK_HEADER([zstd.h], [],
[AC_MSG_ERROR([zstd header not found.])])
CPPFLAGS="$save_CPPFLAGS"
fi

AC_SUBST([ZSTD_CFLAGS])
AC_SUBST([ZSTD_LIBS])
AM_CONDITIONAL([ENABLE_ZSTD], [test "x${enable_zstd}" = "xyes"])

AC_ARG_WITH(tests-as-root,
AS_HELP_STRING([--with-tests-as-root],
[Run the tests as root. Use this on platforms]
Expand Down
Loading