[COMMITTED] Containerfile-debian-stable: Get, build and install dwz 0.16

[COMMITTED] Containerfile-debian-stable: Get, build and install dwz 0.16

[Mark Wielaard]

Debian 13 "trixie" comes with GDB 16.3 and DWZ 0.15. Those versions
are incompatible. gdb-add-index will generate a .gdb-index version 9
which dwz 0.15 doesn't handle (and silently removes). To prevent
spurious test failures (in debugedit) install DWZ 0.16.
---
 builder/containers/Containerfile-debian-stable | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/builder/containers/Containerfile-debian-stable b/builder/containers/Containerfile-debian-stable
index 249634027764..919d1e13f416 100644
--- a/builder/containers/Containerfile-debian-stable
+++ b/builder/containers/Containerfile-debian-stable
@@ -24,6 +24,19 @@ RUN apt-get update && \
       buildbot-worker && \
     apt-get clean
 
+# Get, build and install dwz 0.16
+# Debian 13 "trixie" comes with GDB 16.3 and DWZ 0.15. Those versions
+# are incompatible. gdb-add-index will generate a .gdb-index version 9
+# which dwz 0.15 doesn't handle (and silently removes). To prevent
+# spurious test failures (in debugedit) install DWZ 0.16.
+RUN wget https://sourceware.org/pub/dwz/releases/dwz-0.16.tar.gz && \
+  (echo -n "475853e1b49e6ed8cc2d0a909c7a4fc1cc571ebccfc66278fd43342dbe27d50e"; \
+   echo " dwz-0.16.tar.gz") | sha256sum --check && \
+  tar zxf dwz-0.16.tar.gz && \
+  cd dwz && \
+  ./configure && \
+  make && make install DESTDIR=/usr/local
+
 # Setup user with same id as host user id.
 RUN adduser --home /home/builder --uid 1001 builder
 
-- 
2.50.1

Re: [COMMITTED] Containerfile-debian-stable: Get, build and install dwz 0.16

[Frank Ch. Eigler]

Hi -

> Debian 13 "trixie" comes with GDB 16.3 and DWZ 0.15. Those versions
> are incompatible. gdb-add-index will generate a .gdb-index version 9
> which dwz 0.15 doesn't handle (and silently removes). To prevent
> spurious test failures (in debugedit) install DWZ 0.16.

Or, debugedit could test for the dwz version that's installed, and
skip tests in such a case.

- FChE

Re: [COMMITTED] Containerfile-debian-stable: Get, build and install dwz 0.16

[Mark Wielaard]

Hi Frank,

On Tue, Sep 09, 2025 at 04:19:25PM -0400, Frank Ch. Eigler wrote:
> > Debian 13 "trixie" comes with GDB 16.3 and DWZ 0.15. Those versions
> > are incompatible. gdb-add-index will generate a .gdb-index version 9
> > which dwz 0.15 doesn't handle (and silently removes). To prevent
> > spurious test failures (in debugedit) install DWZ 0.16.
> 
> Or, debugedit could test for the dwz version that's installed, and
> skip tests in such a case.

O, I must admit I forgot you could do version checks :} I was just
thinking a feature check is really hard to do because the error is
silent in dwz. And it is the combination of gdb and dwz versions (gdb
>= 15, needs dwz >= 0.16). The real solution of course is to get the
dwz .gdb_index 9 processing into debian stable somehow.

Let me know if you rather not have this in the Containerfile (we also
already have a sepcific rust version install). I can look into doing a
configure and test in debugedit instead. But I really think nobody
should use the combination of new GDB and old DWZ in this way because
it silently fails.

Cheers,

Mark

Re: [COMMITTED] Containerfile-debian-stable: Get, build and install dwz 0.16

[Mark Wielaard]

[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]

Hi Frank,

On Tue, 2025-09-09 at 22:39 +0200, Mark Wielaard wrote:
> On Tue, Sep 09, 2025 at 04:19:25PM -0400, Frank Ch. Eigler wrote:
> > > Debian 13 "trixie" comes with GDB 16.3 and DWZ 0.15. Those versions
> > > are incompatible. gdb-add-index will generate a .gdb-index version 9
> > > which dwz 0.15 doesn't handle (and silently removes). To prevent
> > > spurious test failures (in debugedit) install DWZ 0.16.
> > 
> > Or, debugedit could test for the dwz version that's installed, and
> > skip tests in such a case.
> 
> O, I must admit I forgot you could do version checks :} I was just
> thinking a feature check is really hard to do because the error is
> silent in dwz. And it is the combination of gdb and dwz versions (gdb
> > = 15, needs dwz >= 0.16). The real solution of course is to get the
> dwz .gdb_index 9 processing into debian stable somehow.
> 
> Let me know if you rather not have this in the Containerfile (we also
> already have a sepcific rust version install). I can look into doing a
> configure and test in debugedit instead.

You were right, this wasn't the way to go. The configure checks were a
bit of a pain to write, but they are the right thing to do.

Reverted the patch as attached.

Cheers,

Mark

[-- Attachment #2: 0001-Revert-Containerfile-debian-stable-Get-build-and-ins.patch --]
[-- Type: text/x-patch, Size: 1731 bytes --]

From f039f02d2052a6b7ede7a87c8fea69c6aa0a1b7b Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 11 Sep 2025 12:25:53 +0200
Subject: [PATCH] Revert "Containerfile-debian-stable: Get, build and install
 dwz 0.16"

This doesn't really work out since the default PATHs and configure
checks detecting the "correct" dwz also would have to be changed.
debugedit now just explicitly checks the gdb and dwz versions and
adjusts which tests are skipped based on that.

This reverts commit 141e6141cb2cbfe5dae1a89d5c7603be5af2a82f.
---
 builder/containers/Containerfile-debian-stable | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/builder/containers/Containerfile-debian-stable b/builder/containers/Containerfile-debian-stable
index 919d1e13f416..249634027764 100644
--- a/builder/containers/Containerfile-debian-stable
+++ b/builder/containers/Containerfile-debian-stable
@@ -24,19 +24,6 @@ RUN apt-get update && \
       buildbot-worker && \
     apt-get clean
 
-# Get, build and install dwz 0.16
-# Debian 13 "trixie" comes with GDB 16.3 and DWZ 0.15. Those versions
-# are incompatible. gdb-add-index will generate a .gdb-index version 9
-# which dwz 0.15 doesn't handle (and silently removes). To prevent
-# spurious test failures (in debugedit) install DWZ 0.16.
-RUN wget https://sourceware.org/pub/dwz/releases/dwz-0.16.tar.gz && \
-  (echo -n "475853e1b49e6ed8cc2d0a909c7a4fc1cc571ebccfc66278fd43342dbe27d50e"; \
-   echo " dwz-0.16.tar.gz") | sha256sum --check && \
-  tar zxf dwz-0.16.tar.gz && \
-  cd dwz && \
-  ./configure && \
-  make && make install DESTDIR=/usr/local
-
 # Setup user with same id as host user id.
 RUN adduser --home /home/builder --uid 1001 builder
 
-- 
2.50.1