From cba2ad4742a4668f1e01371c117ad2e5427e0952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 20 Apr 2026 15:25:53 +0200 Subject: [PATCH 1/5] update Extrae hook for version > 5.0.0 --- eb_hooks.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/eb_hooks.py b/eb_hooks.py index 4bcab664..ccd85601 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -1149,7 +1149,16 @@ def pre_configure_hook_extrae(self, *args, **kwargs): binutils_lib_path_glob_pattern = os.path.join(eprefix, 'usr', 'lib*', 'binutils', '*-linux-gnu', '2.*') binutils_lib_path = glob.glob(binutils_lib_path_glob_pattern) if len(binutils_lib_path) == 1: - self.cfg.update('configopts', '--with-binutils=' + binutils_lib_path[0]) + if self.version < LooseVersion('5.0.0'): + self.cfg.update('configopts', '--with-binutils=' + binutils_lib_path[0]) + else: + # Setting --with-binutils to the real binutils subdir (as for older versions) causes issues for finding addr2line, + # as it will try to find that binary in $BINUTILS_ROOT/bin, + # so we use $EPREFIX/usr instead. + # Also, as of version 5, we can use more specific flags for binutils headers and libraries. + self.cfg.update('configopts', '--with-binutils=' + os.path.join(eprefix, 'usr')) + self.cfg.update('configopts', '--with-binutils-headers=' + os.path.join(binutils_lib_path[0], 'include')) + self.cfg.update('configopts', '--with-binutils-libs=' + binutils_lib_path[0]) else: raise EasyBuildError("Failed to isolate path for binutils libraries using %s, got %s", binutils_lib_path_glob_pattern, binutils_lib_path) @@ -1157,14 +1166,12 @@ def pre_configure_hook_extrae(self, *args, **kwargs): # zlib is a filtered dependency, so we need to manually specify it's location to avoid the host version self.cfg.update('configopts', '--with-libz=' + eprefix) - # replace use of 'which' with 'command -v', since 'which' is broken in EESSI build container; - # this must be done *after* running configure script, because initial configuration re-writes configure script, - # and problem due to use of which only pops up when running make ?! + # replace use of 'which' with 'command -v' in several files, since 'which' is broken in EESSI build container self.cfg.update( - 'prebuildopts', - "cp config/mpi-macros.m4 config/mpi-macros.m4.orig && " - "sed -i 's/`which /`command -v /g' config/mpi-macros.m4 && " - ) + 'preconfigopts', + "sed -i.orig 's/`which /`command -v /g' config/mpi-macros.m4 configure.ac config/macros.m4 include/Makefile.am Makefile.am tests/overhead/Makefile.am && " + "autoreconf -fi && " + ) else: raise EasyBuildError("Extrae-specific hook triggered for non-Extrae easyconfig?!") From 2d6eb21ca561507ffcd09bcbce3ca072218c6ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 20 Apr 2026 15:30:01 +0200 Subject: [PATCH 2/5] test Extrae-5.0.0-gompi-2025b.eb --- .../software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml new file mode 100644 index 00000000..392a5ed4 --- /dev/null +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml @@ -0,0 +1,2 @@ +easyconfigs: + - Extrae-5.0.0-gompi-2025b.eb From ecc59feb6be1f7787645a55bc78f8af5691931e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 20 Apr 2026 15:32:18 +0200 Subject: [PATCH 3/5] test Extrae-4.2.0-gompi-2023b.eb --- .../software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml new file mode 100644 index 00000000..d16fc4ac --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml @@ -0,0 +1,2 @@ +easyconfigs: + - Extrae-4.2.0-gompi-2023b.eb From a7e4c629b37527783863f8e40260c0be17ce021e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 20 Apr 2026 15:32:52 +0200 Subject: [PATCH 4/5] rebuild: true --- .../2023.06/eessi-2023.06-eb-5.3.0-2023b.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml index d16fc4ac..03eabe7a 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml @@ -1,2 +1,4 @@ easyconfigs: - - Extrae-4.2.0-gompi-2023b.eb + - Extrae-4.2.0-gompi-2023b.eb: + options: + rebuild: True From de0398a12c838c29156c47ad7992223629c65382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 20 Apr 2026 16:19:36 +0200 Subject: [PATCH 5/5] remove easystacks --- .../2023.06/eessi-2023.06-eb-5.3.0-2023b.yml | 4 ---- .../2025.06/eessi-2025.06-eb-5.3.0-2025b.yml | 2 -- 2 files changed, 6 deletions(-) delete mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml delete mode 100644 easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml deleted file mode 100644 index 03eabe7a..00000000 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.3.0-2023b.yml +++ /dev/null @@ -1,4 +0,0 @@ -easyconfigs: - - Extrae-4.2.0-gompi-2023b.eb: - options: - rebuild: True diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml deleted file mode 100644 index 392a5ed4..00000000 --- a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025b.yml +++ /dev/null @@ -1,2 +0,0 @@ -easyconfigs: - - Extrae-5.0.0-gompi-2025b.eb