[PATCH] master.cfg: Use the new --with-elfutils= option for Libabigail multithreading setup

Dodji Seketeli dodji@seketeli.org
Thu Aug 27 16:28:36 GMT 2026


Hello,

Now that Libabigail's configure script supports --with-elfutils=
rather than the combo --with-lib{dw,elf}, this patch cleans up the
configuration step of Libabigail's multithreading build to use the new
option instead.

Signed-off-by: Dodji Seketeli <dodji@seketeli.org>
---
 builder/master.cfg | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index da46533..87ea05b 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -4982,12 +4982,7 @@ libabigail_factory_snapshot_html_doc.addStep(libabigail_create_publish_file_step
 # mttsan sequentially (like gdb_factory's multiple check + bunsen tagsuffix
 # cycles).  No dedicated container; reuse fedora-latest.  Master builders
 # stay on the ordinary factory until this proves out on try branches.
-libabigail_euts_env = {
-        'LD_LIBRARY_PATH': util.Interpolate(
-                '%(prop:builddir)s/euts/lib64:%(prop:builddir)s/euts/lib'),
-        'PKG_CONFIG_PATH': util.Interpolate(
-                '%(prop:builddir)s/euts/lib64/pkgconfig:%(prop:builddir)s/euts/lib/pkgconfig'),
-}
+
 # Checkout elfutils first (alwaysUseLatest main), then libabigail, so
 # got_revision / bunsen source.* remain on the libabigail try commit.
 libabigail_elfutils_git_step = steps.Git(
@@ -5039,24 +5034,17 @@ def libabigail_mt_combo_steps(build_name, configure_extra, tagsuffix):
                 name="rm -rf " + build_name,
                 haltOnFailure=True))
         configure_cmd = ["../build/configure",
-                         # Where to find elfutils header files install
-                         # directory.
-                         util.Interpolate("--prefix=%(prop:builddir)s/euts"),
-                         # Where to find libdw.so
-                         util.Interpolate("--with-libdw=%(prop:builddir)s/euts"),
-                         # Where to find libelf.so
-                         util.Interpolate("--with-elf=%(prop:builddir)s/euts"),
+                         # Where to find elfutils
+                         util.Interpolate("--with-elfutils=%(prop:builddir)s/euts"),
                          "--enable-multithreading"] + list(configure_extra)
         distcheck_flags = util.Interpolate(
                 "DISTCHECK_CONFIGURE_FLAGS="
-                "--with-libdw=%(prop:builddir)s/euts "
-                "--with-elf=%(prop:builddir)s/euts "
+                "--with-elfutils=%(prop:builddir)s/euts "
                 "--enable-multithreading"
                 + ((" " + " ".join(configure_extra)) if configure_extra else ""))
         s.append(steps.Configure(
                 workdir=build_name,
                 command=configure_cmd,
-                env=libabigail_euts_env,
                 name="configure " + build_name, haltOnFailure=True,
                 logfiles={"config.log": "config.log"}))
         # distcheck's test-suite.log lives under $name-$version/_build/...;
@@ -5070,7 +5058,6 @@ def libabigail_mt_combo_steps(build_name, configure_extra, tagsuffix):
                 workdir=build_name,
                 command=addOutputSync.withArgs(["make",
                     util.Interpolate('-j%(prop:ncpus)s')]),
-                env=libabigail_euts_env,
                 name="make " + build_name,
                 haltOnFailure=True))
         s.append(steps.Test(
@@ -5078,7 +5065,6 @@ def libabigail_mt_combo_steps(build_name, configure_extra, tagsuffix):
                 command=addOutputSync.withArgs(
                         ["make", "check", "check-self-compare",
                          util.Interpolate('-j%(prop:ncpus)s')]),
-                env=libabigail_euts_env,
                 name="make check " + build_name,
                 haltOnFailure=False, flunkOnFailure=True,
                 logfiles={"test-suite.log": "tests/test-suite.log"}))
@@ -5087,7 +5073,6 @@ def libabigail_mt_combo_steps(build_name, configure_extra, tagsuffix):
                 command=addOutputSync.withArgs(
                         ["make", "distcheck-fast", distcheck_flags,
                          util.Interpolate('-j%(prop:ncpus)s')]),
-                env=libabigail_euts_env,
                 name="make distcheck " + build_name,
                 haltOnFailure=False, flunkOnFailure=True,
                 timeout=3600,
-- 
2.55.0


-- 
		Dodji


More information about the Buildbot mailing list