From 2adfe266193c9b03005382799a43ad7568faf7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Oct 2025 14:36:34 +0200 Subject: [PATCH 1/4] add parse hook for mesa --- eb_hooks.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index c0b30eec..6a86ca14 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -429,6 +429,20 @@ def parse_hook_grpcio_zlib(ec, ecprefix): raise EasyBuildError("grpcio-specific hook triggered for a non-grpcio easyconfig?!") +def parse_hook_mesa_use_llvm_minimal(ec, eprefix): + """ + Replace Mesa dependency on LLVM 18.1.8 by one on LLVM 18.1.8-minimal, + as the full LLVM 18.1.8 installation does not have sysroot support. + """ + if ec.name == 'Mesa' and ec.version == '24.1.3': + deps = ec['dependencies'] + llvm_name, llvm_version = ('LLVM', '18.1.8') + for idx, dep in enumerate(deps): + if dep[0] == llvm_name and dep[1] == llvm_version: + deps[idx] = (llvm_name, llvm_version, '-minimal') + break + + def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix): """Relax number of failing numerical LAPACK tests for aarch64/neoverse_v1 CPU target for OpenBLAS < 0.3.23""" cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR') @@ -1595,6 +1609,7 @@ def post_easyblock_hook(self, *args, **kwargs): 'fontconfig': parse_hook_fontconfig_add_fonts, 'FreeImage': parse_hook_freeimage_aarch64, 'grpcio': parse_hook_grpcio_zlib, + 'Mesa': parse_hook_mesa_use_llvm_minimal, 'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors, 'pybind11': parse_hook_pybind11_replace_catch2, 'Qt5': parse_hook_qt5_check_qtwebengine_disable, From 633d403f3524367b77cab800800aa7f4d0dbd9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Oct 2025 14:38:14 +0200 Subject: [PATCH 2/4] easystack with Mesa --- .../software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml new file mode 100644 index 00000000..44c2f386 --- /dev/null +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml @@ -0,0 +1,2 @@ +easyconfigs: + - Mesa-24.1.3-GCCcore-13.3.0.eb From c15f34ee4be474f89bf31e716152631c4445dc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Oct 2025 16:41:54 +0200 Subject: [PATCH 3/4] add llvm + easyblock fix from PR 3952 --- .../software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml index 44c2f386..6fbc27b1 100644 --- a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml @@ -1,2 +1,5 @@ easyconfigs: + - LLVM-18.1.8-GCCcore-13.3.0-minimal.eb: + options: + include-easyblocks-from-commit: c1c31c5ccd7fad783e70fa5c6af5dfc3129e4e0f - Mesa-24.1.3-GCCcore-13.3.0.eb From e0e21724bdf43e52a124252dd3a11f0f756b8628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Oct 2025 19:31:47 +0200 Subject: [PATCH 4/4] remove easystack --- .../2025.06/eessi-2025.06-eb-5.1.2-2024a.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml deleted file mode 100644 index 6fbc27b1..00000000 --- a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml +++ /dev/null @@ -1,5 +0,0 @@ -easyconfigs: - - LLVM-18.1.8-GCCcore-13.3.0-minimal.eb: - options: - include-easyblocks-from-commit: c1c31c5ccd7fad783e70fa5c6af5dfc3129e4e0f - - Mesa-24.1.3-GCCcore-13.3.0.eb