From ba8ee7a0ee2b1668eccf95665acf40886dce0868 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 29 Jul 2024 14:47:31 +0200 Subject: [PATCH 1/5] Rebuild Python with ctypes fix --- .../20240729-eb-4.9.2-Python-ctypes.yml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml new file mode 100644 index 0000000000..95bd27852a --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml @@ -0,0 +1,21 @@ +# 2024.07.29 +# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. There is a workaround +# for the EasyBuild context in https://github.com/easybuilders/easybuild-easyblocks/pull/3352. +# +# This rebuild ensures this fix is available for all Python versions shipped with EESSI. +# +# See https://gitlab.com/eessi/support/-/issues/77 +easyconfigs: + - Python/3.10.8-GCCcore-12.2.0-bare + options: + include-easyblocks-from-pr: 3352 + - Python/3.10.8-GCCcore-12.2.0 + options: + include-easyblocks-from-pr: 3352 + - Python/3.11.3-GCCcore-12.3.0 + options: + include-easyblocks-from-pr: 3352 + - Python/3.11.5-GCCcore-13.2.0 + options: + include-easyblocks-from-pr: 3352 + - librosa-0.10.1-foss-2023a.eb From bfd12d220e9487939a5b6c1372d074a7290c579e Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Mon, 29 Jul 2024 15:44:23 +0200 Subject: [PATCH 2/5] Finish with colon if we want to pass options --- .../2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml index 95bd27852a..6fa1b34992 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml @@ -6,16 +6,16 @@ # # See https://gitlab.com/eessi/support/-/issues/77 easyconfigs: - - Python/3.10.8-GCCcore-12.2.0-bare + - Python/3.10.8-GCCcore-12.2.0-bare: options: include-easyblocks-from-pr: 3352 - - Python/3.10.8-GCCcore-12.2.0 + - Python/3.10.8-GCCcore-12.2.0: options: include-easyblocks-from-pr: 3352 - - Python/3.11.3-GCCcore-12.3.0 + - Python/3.11.3-GCCcore-12.3.0: options: include-easyblocks-from-pr: 3352 - - Python/3.11.5-GCCcore-13.2.0 + - Python/3.11.5-GCCcore-13.2.0: options: include-easyblocks-from-pr: 3352 - librosa-0.10.1-foss-2023a.eb From 0f816f5a9e4081b3abccae0851f3a22cd9c187fd Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Mon, 29 Jul 2024 15:55:25 +0200 Subject: [PATCH 3/5] Move librosa to a regular EasyStack file, instead of a rebuilds --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml | 1 + .../2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml index d405d17193..8db39671ee 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml @@ -27,3 +27,4 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20951 from-commit: a92667fe32396bbd4106243658625f7ff2adcd68 - amdahl-0.3.1-gompi-2023a.eb + - librosa-0.10.1-foss-2023a.eb diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml index 6fa1b34992..09dde357cd 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml @@ -18,4 +18,3 @@ easyconfigs: - Python/3.11.5-GCCcore-13.2.0: options: include-easyblocks-from-pr: 3352 - - librosa-0.10.1-foss-2023a.eb From 66093b7a154bdbcd22bb5ce4dcbb6397951b4369 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Mon, 29 Jul 2024 16:24:01 +0200 Subject: [PATCH 4/5] Replace slash with dash to make this a proper easyconfig name, instead of a module name --- .../2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml index 09dde357cd..c73d67fcd2 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml @@ -6,15 +6,15 @@ # # See https://gitlab.com/eessi/support/-/issues/77 easyconfigs: - - Python/3.10.8-GCCcore-12.2.0-bare: + - Python-3.10.8-GCCcore-12.2.0-bare: options: include-easyblocks-from-pr: 3352 - - Python/3.10.8-GCCcore-12.2.0: + - Python-3.10.8-GCCcore-12.2.0: options: include-easyblocks-from-pr: 3352 - - Python/3.11.3-GCCcore-12.3.0: + - Python-3.11.3-GCCcore-12.3.0: options: include-easyblocks-from-pr: 3352 - - Python/3.11.5-GCCcore-13.2.0: + - Python-3.11.5-GCCcore-13.2.0: options: include-easyblocks-from-pr: 3352 From a2041a00cdf4847ea71db941139bb4d83250f4e4 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Tue, 30 Jul 2024 09:10:49 +0200 Subject: [PATCH 5/5] Update 20240729-eb-4.9.2-Python-ctypes.yml --- .../rebuilds/20240729-eb-4.9.2-Python-ctypes.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml index c73d67fcd2..7554289c3b 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml @@ -8,13 +8,17 @@ easyconfigs: - Python-3.10.8-GCCcore-12.2.0-bare: options: - include-easyblocks-from-pr: 3352 + # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352 + include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f - Python-3.10.8-GCCcore-12.2.0: options: - include-easyblocks-from-pr: 3352 + # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352 + include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f - Python-3.11.3-GCCcore-12.3.0: options: - include-easyblocks-from-pr: 3352 + # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352 + include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f - Python-3.11.5-GCCcore-13.2.0: options: - include-easyblocks-from-pr: 3352 + # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352 + include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f