From 96997167ba74eb5be35a72798d281f20cd59b832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 11 Jul 2025 16:26:56 +0200 Subject: [PATCH 01/11] add Rust 1.65.0 with try-software-version=1.70.0 --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml index 261c7dde5e..cef65d644f 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml @@ -35,3 +35,6 @@ easyconfigs: # - HarfBuzz-5.3.1-GCCcore-12.2.0.eb ## - Qt5-5.15.7-GCCcore-12.2.0.eb ## - QuantumESPRESSO-7.2-foss-2022b.eb +- Rust-1.65.0-GCCcore-12.2.0.eb: + options: + try-software-version: 1.70.0 From a19a58e2b938b622a27c272823cacc6e21f8ed3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 11 Jul 2025 16:37:03 +0200 Subject: [PATCH 02/11] fix indentation --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml index cef65d644f..d0c3ab0785 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml @@ -35,6 +35,6 @@ easyconfigs: # - HarfBuzz-5.3.1-GCCcore-12.2.0.eb ## - Qt5-5.15.7-GCCcore-12.2.0.eb ## - QuantumESPRESSO-7.2-foss-2022b.eb -- Rust-1.65.0-GCCcore-12.2.0.eb: - options: - try-software-version: 1.70.0 + - Rust-1.65.0-GCCcore-12.2.0.eb: + options: + try-software-version: 1.70.0 From 2ee989be3be89f1891cbc7665dc57328a68216bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 11 Jul 2025 16:59:06 +0200 Subject: [PATCH 03/11] easyconfig for Rust 1.70.0 --- Rust-1.70.0-GCCcore-12.2.0.eb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Rust-1.70.0-GCCcore-12.2.0.eb diff --git a/Rust-1.70.0-GCCcore-12.2.0.eb b/Rust-1.70.0-GCCcore-12.2.0.eb new file mode 100644 index 0000000000..c20b92b4ab --- /dev/null +++ b/Rust-1.70.0-GCCcore-12.2.0.eb @@ -0,0 +1,29 @@ +name = 'Rust' +version = '1.70.0' + +homepage = 'https://www.rust-lang.org' +description = """Rust is a systems programming language that runs blazingly fast, prevents segfaults, + and guarantees thread safety.""" + +toolchain = {'name': 'GCCcore', 'version': '12.2.0'} + +source_urls = ['https://static.rust-lang.org/dist/'] +sources = ['rustc-%(version)s-src.tar.gz'] +patches = ['Rust-1.70_sysroot-fix-interpreter.patch'] +checksums = [ + {'rustc-1.70.0-src.tar.gz': 'b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c'}, + {'Rust-1.70_sysroot-fix-interpreter.patch': '220129db55e022a98d25028da5dcc9f26b252dd995c3ac92f6312dbb1e362cb1'}, +] + +builddependencies = [ + ('binutils', '2.39'), + ('CMake', '3.24.3'), + ('Python', '3.10.8', '-bare'), + ('pkgconf', '1.9.3'), +] + +dependencies = [ + ('OpenSSL', '1.1', '', SYSTEM), +] + +moduleclass = 'lang' From 53216b2f1141ba5fa56449b67d4dc68cfa4422fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 11 Jul 2025 16:59:28 +0200 Subject: [PATCH 04/11] use Rust 1.70.0 easyconfig --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml index d0c3ab0785..518326c585 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml @@ -35,6 +35,4 @@ easyconfigs: # - HarfBuzz-5.3.1-GCCcore-12.2.0.eb ## - Qt5-5.15.7-GCCcore-12.2.0.eb ## - QuantumESPRESSO-7.2-foss-2022b.eb - - Rust-1.65.0-GCCcore-12.2.0.eb: - options: - try-software-version: 1.70.0 + - Rust-1.70.0-GCCcore-12.2.0.eb From 53e69f4eae0297d524aad7e6d4181b433699aa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 11 Jul 2025 23:34:12 +0200 Subject: [PATCH 05/11] try a few more versions --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml index 518326c585..41b163f6e2 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml @@ -35,4 +35,12 @@ easyconfigs: # - HarfBuzz-5.3.1-GCCcore-12.2.0.eb ## - Qt5-5.15.7-GCCcore-12.2.0.eb ## - QuantumESPRESSO-7.2-foss-2022b.eb - - Rust-1.70.0-GCCcore-12.2.0.eb + - Rust-1.65.0-GCCcore-12.2.0.eb: + options: + try-software-version: 1.67.0 + - Rust-1.65.0-GCCcore-12.2.0.eb: + options: + try-software-version: 1.68.0 + - Rust-1.65.0-GCCcore-12.2.0.eb: + options: + try-software-version: 1.69.0 From a6eb4669d2bbe180bb83c031d0f67f827f595e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Sat, 12 Jul 2025 07:51:44 +0200 Subject: [PATCH 06/11] reverse order --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml index 41b163f6e2..2cb63a31cd 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml @@ -37,10 +37,10 @@ easyconfigs: ## - QuantumESPRESSO-7.2-foss-2022b.eb - Rust-1.65.0-GCCcore-12.2.0.eb: options: - try-software-version: 1.67.0 + try-software-version: 1.69.0 - Rust-1.65.0-GCCcore-12.2.0.eb: options: try-software-version: 1.68.0 - Rust-1.65.0-GCCcore-12.2.0.eb: options: - try-software-version: 1.69.0 + try-software-version: 1.67.0 From 081abba18795eb9cdd03333268de4f5d8039a66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Sat, 12 Jul 2025 09:49:23 +0200 Subject: [PATCH 07/11] use 1.70 as base for 1.69 --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml index 2cb63a31cd..9ca8eae4f4 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml @@ -35,7 +35,7 @@ easyconfigs: # - HarfBuzz-5.3.1-GCCcore-12.2.0.eb ## - Qt5-5.15.7-GCCcore-12.2.0.eb ## - QuantumESPRESSO-7.2-foss-2022b.eb - - Rust-1.65.0-GCCcore-12.2.0.eb: + - Rust-1.70.0-GCCcore-12.2.0.eb: options: try-software-version: 1.69.0 - Rust-1.65.0-GCCcore-12.2.0.eb: From d69c69bf20dc521e8920f3d3c07d8bf24f5a4a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 14 Jul 2025 11:06:20 +0200 Subject: [PATCH 08/11] add modifued ec for Rust 1.65.0 --- Rust-1.65.0-GCCcore-12.2.0.eb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Rust-1.65.0-GCCcore-12.2.0.eb diff --git a/Rust-1.65.0-GCCcore-12.2.0.eb b/Rust-1.65.0-GCCcore-12.2.0.eb new file mode 100644 index 0000000000..e2bbc4bb21 --- /dev/null +++ b/Rust-1.65.0-GCCcore-12.2.0.eb @@ -0,0 +1,33 @@ +name = 'Rust' +version = '1.65.0' + +homepage = 'https://www.rust-lang.org' +description = """Rust is a systems programming language that runs blazingly fast, prevents segfaults, + and guarantees thread safety.""" + +toolchain = {'name': 'GCCcore', 'version': '12.2.0'} + +source_urls = ['https://static.rust-lang.org/dist/'] +sources = ['rustc-%(version)s-src.tar.gz', 'rustc-1.70.0-src.tar.gz'] +patches = ['Rust-1.60_sysroot-fix-interpreter.patch'] +checksums = [ + {'rustc-1.65.0-src.tar.gz': '5828bb67f677eabf8c384020582b0ce7af884e1c84389484f7f8d00dd82c0038'}, + {'rustc-1.70.0-src.tar.gz': 'b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c'}, + {'Rust-1.60_sysroot-fix-interpreter.patch': 'b59ed4c2591fc9098277299be21dd6752654f6f193d8652b7d21cb0fa0dd8716'}, +] + +builddependencies = [ + ('binutils', '2.39'), + ('CMake', '3.24.3'), + ('Python', '3.10.8', '-bare'), + ('pkgconf', '1.9.3'), +] + +dependencies = [ + ('OpenSSL', '1.1', '', SYSTEM), +] + +preconfigopts = 'mv %(start_dir)s/src/llvm-project %(start_dir)s/src/llvm-project.bak && ' +preconfigopts += 'ln -s %(builddir)s/rustc-1.70.0-src/src/llvm-project %(start_dir)s/src/llvm-project && ' + +moduleclass = 'lang' From 54fc17491a0cd3c2f03a85366bd80c363426a6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 14 Jul 2025 11:07:02 +0200 Subject: [PATCH 09/11] only build (modified) 1.65.0 --- .../a64fx/eessi-2023.06-eb-4.9.4-2022b.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml index 9ca8eae4f4..39d9b51dc9 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml @@ -35,12 +35,12 @@ easyconfigs: # - HarfBuzz-5.3.1-GCCcore-12.2.0.eb ## - Qt5-5.15.7-GCCcore-12.2.0.eb ## - QuantumESPRESSO-7.2-foss-2022b.eb - - Rust-1.70.0-GCCcore-12.2.0.eb: - options: - try-software-version: 1.69.0 - - Rust-1.65.0-GCCcore-12.2.0.eb: - options: - try-software-version: 1.68.0 - - Rust-1.65.0-GCCcore-12.2.0.eb: - options: - try-software-version: 1.67.0 +# - Rust-1.70.0-GCCcore-12.2.0.eb: +# options: +# try-software-version: 1.69.0 + - Rust-1.65.0-GCCcore-12.2.0.eb +# options: +# try-software-version: 1.68.0 +# - Rust-1.65.0-GCCcore-12.2.0.eb: +# options: +# try-software-version: 1.67.0 From 5442e3d1e860be7d964e6dcab6e8bffc7c90bfd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 15 Jul 2025 23:25:07 +0200 Subject: [PATCH 10/11] also use rustc_llvm from 1.70.0 --- Rust-1.65.0-GCCcore-12.2.0.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rust-1.65.0-GCCcore-12.2.0.eb b/Rust-1.65.0-GCCcore-12.2.0.eb index e2bbc4bb21..9e28e81f92 100644 --- a/Rust-1.65.0-GCCcore-12.2.0.eb +++ b/Rust-1.65.0-GCCcore-12.2.0.eb @@ -29,5 +29,7 @@ dependencies = [ preconfigopts = 'mv %(start_dir)s/src/llvm-project %(start_dir)s/src/llvm-project.bak && ' preconfigopts += 'ln -s %(builddir)s/rustc-1.70.0-src/src/llvm-project %(start_dir)s/src/llvm-project && ' +preconfigopts += 'mv %(start_dir)s/compiler/rustc_llvm %(start_dir)s/compiler/rustc_llvm.bak && ' +preconfigopts += 'ln -s %(builddir)s/rustc-1.70.0-src/compiler/rustc_llvm %(start_dir)s/compiler/rustc_llvm && ' moduleclass = 'lang' From e61c79c0bb953ad3800799081742c358fff96dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 18 Jul 2025 19:40:40 +0200 Subject: [PATCH 11/11] also use rustc_smir from 1.70.0 --- Rust-1.65.0-GCCcore-12.2.0.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rust-1.65.0-GCCcore-12.2.0.eb b/Rust-1.65.0-GCCcore-12.2.0.eb index 9e28e81f92..7bef209e13 100644 --- a/Rust-1.65.0-GCCcore-12.2.0.eb +++ b/Rust-1.65.0-GCCcore-12.2.0.eb @@ -31,5 +31,7 @@ preconfigopts = 'mv %(start_dir)s/src/llvm-project %(start_dir)s/src/llvm-projec preconfigopts += 'ln -s %(builddir)s/rustc-1.70.0-src/src/llvm-project %(start_dir)s/src/llvm-project && ' preconfigopts += 'mv %(start_dir)s/compiler/rustc_llvm %(start_dir)s/compiler/rustc_llvm.bak && ' preconfigopts += 'ln -s %(builddir)s/rustc-1.70.0-src/compiler/rustc_llvm %(start_dir)s/compiler/rustc_llvm && ' +preconfigopts += 'mv %(start_dir)s/compiler/rustc_smir %(start_dir)s/compiler/rustc_smir.bak && ' +preconfigopts += 'ln -s %(builddir)s/rustc-1.70.0-src/compiler/rustc_smir %(start_dir)s/compiler/rustc_smir && ' moduleclass = 'lang'