Upgrade from elfutils 0.189 to 0.193

Drop our patch for correctly handling core files with non-contiguous
segments. This patch made it into the upstream 0.191 release.

Work around some new warnings that appear when building `elfutils` on
musl by setting `-Wno-error` in both `CFLAGS` and `CXXFLAGS`.

While we're at it, standardize the flags used for building `elfutils`
across `manylinux` and `musllinux`.

Signed-off-by: Matt Wozniski <[email protected]>

Author: godlygeek

Dockerfile

@@ -1,7 +1,7 @@
 # Stage 1: Elfutils build stage
 FROM ubuntu:22.04 AS elfutils_builder
 ARG DEBIAN_FRONTEND=noninteractive
-ENV VERS=0.189
+ENV VERS=0.193
 
 # Install elfutils build dependencies
 RUN apt-get update \
@@ -31,7 +31,7 @@ RUN apt-get update \
     && cd /elfutils \
     && curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2 \
     && tar -xf elfutils.tar.bz2 --strip-components 1 \
-    && CFLAGS='-w' ./configure --prefix=/usr/local --disable-nls --disable-debuginfod --enable-libdebuginfod=dummy --with-zstd \
+    && CFLAGS='-Wno-error -g -O3' CXXFLAGS='-Wno-error -g -O3' ./configure --disable-nls --enable-libdebuginfod=dummy --disable-debuginfod --with-zstd \
     && make install
 
 # Stage 2: Final stage

MANIFEST.in

@@ -14,7 +14,6 @@ include README.md
 include src/pystack/py.typed
 include .bumpversion.cfg
 include .pre-commit-config.yaml
-include build_scripts/elfutils_contiguous_segments.diff
 
 recursive-include src/pystack/_pystack *
 recursive-include src/pystack *.py

build_scripts/elfutils_contiguous_segments.diff

@@ -51,14 +51,13 @@ skip = "*-musllinux_aarch64"
 
 [tool.cibuildwheel.linux]
 before-all = [
-  "yum install -y python-devel-2.7.5",
+  "yum install -y python-devel-2.7.5 libzstd-devel",
   "cd /",
-  "VERS=0.189",
+  "VERS=0.193",
   "curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
   "tar -xf elfutils.tar.bz2",
   "cd elfutils-$VERS",
-  "patch libdwfl/dwfl_segment_report_module.c < {package}/build_scripts/elfutils_contiguous_segments.diff",
-  "CFLAGS='-w' ./configure --enable-libdebuginfod=dummy --disable-debuginfod --prefix=/usr --libdir=/usr/lib64",
+  "CFLAGS='-Wno-error -g -O3' CXXFLAGS='-Wno-error -g -O3' ./configure --disable-nls --enable-libdebuginfod=dummy --disable-debuginfod --with-zstd",
   "make install"
 ]
 
@@ -76,12 +75,11 @@ before-all = [
   # https://git.alpinelinux.org/aports/tree/main/elfutils/musl-macros.patch
   "cd /",
   "apk add --update argp-standalone bison bsd-compat-headers bzip2-dev flex-dev libtool linux-headers musl-fts-dev musl-libintl musl-obstack-dev xz-dev zlib-dev zstd-dev",
-  "VERS=0.189",
+  "VERS=0.193",
   "curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
   "tar -xf elfutils.tar.bz2",
   "cd elfutils-$VERS",
-  "patch libdwfl/dwfl_segment_report_module.c < {package}/build_scripts/elfutils_contiguous_segments.diff",
-  "CFLAGS='-w -DFNM_EXTMATCH=0' ./configure --prefix=/usr --disable-nls --disable-libdebuginfod --disable-debuginfod --with-zstd",
+  "CFLAGS='-Wno-error -DFNM_EXTMATCH=0 -g -O3' CXXFLAGS='-Wno-error -g -O3' ./configure --disable-nls --enable-libdebuginfod=dummy --disable-debuginfod --with-zstd",
   "make install",
 
   # Reinstall libintl, as the Python interpreter requires it