From edd864f8805411e1422f40c0cb8b0eeb6fa691b5 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 3 Jan 2024 02:00:18 +0000 Subject: [PATCH] extra/rust to 1.75.0-1 --- extra/rust/.SRCINFO | 16 +-- .../0001-bootstrap-Change-libexec-dir.patch | 22 ++-- ...bootstrap-Change-bash-completion-dir.patch | 12 +- .../0003-compiler-Change-LLVM-targets.patch | 46 +++---- ...ompiler-Use-wasm-ld-for-wasm-targets.patch | 12 +- extra/rust/PKGBUILD | 20 +-- ...8F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE.asc | 116 +++++++++--------- 7 files changed, 124 insertions(+), 120 deletions(-) diff --git a/extra/rust/.SRCINFO b/extra/rust/.SRCINFO index ec9f51ed7..b741f1f21 100644 --- a/extra/rust/.SRCINFO +++ b/extra/rust/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = rust pkgdesc = Systems programming language focused on safety, speed and concurrency - pkgver = 1.74.1 + pkgver = 1.75.0 pkgrel = 1 epoch = 1 url = https://www.rust-lang.org/ @@ -29,19 +29,19 @@ pkgbase = rust options = !emptydirs options = !lto options = !strip - source = https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.gz - source = https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.gz.asc + source = https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.gz + source = https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.gz.asc source = 0001-bootstrap-Change-libexec-dir.patch source = 0002-bootstrap-Change-bash-completion-dir.patch source = 0003-compiler-Change-LLVM-targets.patch source = 0004-compiler-Use-wasm-ld-for-wasm-targets.patch validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE - b2sums = 71d86d8606ee06c44cd395a8fac73b6cdebd9c8993fdf9395e3f89bdd7fa480a273233f4c18e0823e889a2e5045354e1638d827e7c9d162c5101b3e6bb9af294 + b2sums = 6877d5bc89335be051639d21f723c1b596d83e837781ac691795ad3abf999e18c4fb07a2a9048da9ea860b3c4777cb2d49db7dc5081085da5f10888eebe0224e b2sums = SKIP - b2sums = b9591ca4b50ff4d825deeca1858a65ae6b25171e4a03f2fdee9a51e79590825e012af0592df63ecb7b27837d0959e7f0c4075dddddb42c8cc4ee98be451d0d12 - b2sums = c8db828623b9bc2c9c34a4594f4c9409585c55815d0f3c0bf8b48ea2d3a01fe866c15850503ad5d3b6e04a6e68dd7e7f064d9745f4eb60a267fb90c7ad101d70 - b2sums = a55aad4494907ea2f394754026b4ddff03a062a60ba92fc53aa6b6bcf3065807ca8df61ed1502e3873c114704533ae2790df1970cc4be44f8b89e1094be583b1 - b2sums = e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117 + b2sums = a55e8eca7d700f4dad9a09030cab97a5d7b28a56d4dfb03d75b09f66d04c05907a8e81df95af21f0caad12dcad17a292de55a4eb5eedf4f1a6d4a5f8dd053c83 + b2sums = d3050f44d166530c65f98f0546fbbfe1f924789db66a9982d5e6591029355da6ce0a471c98bab153bcdff4ebe9cd68622e2b697694c880a875e2b5ca8f49822b + b2sums = 0a1d5e8709a73a4f0825231362c1cb0f6b4fdc72d0082f222da6479e6075e945fb041b43a57fbe2844247c9a2f148d335c723bdf0d92083c62f6c19f56ce5c0c + b2sums = 6a7d2ca75109de1a4b2aedc16f026bb97eaf00fa1ade67da92a48ce47b3d71a6403a349f73b3b4fb02dfde34bcbd6108510d7dd6f6a98eaf439521ab2205e52c pkgname = rust optdepends = gdb: rust-gdb script diff --git a/extra/rust/0001-bootstrap-Change-libexec-dir.patch b/extra/rust/0001-bootstrap-Change-libexec-dir.patch index f76c70d6e..17f7f37ff 100644 --- a/extra/rust/0001-bootstrap-Change-libexec-dir.patch +++ b/extra/rust/0001-bootstrap-Change-libexec-dir.patch @@ -4,14 +4,14 @@ Date: Thu, 6 May 2021 20:14:58 +0200 Subject: [PATCH] bootstrap: Change libexec dir --- - src/bootstrap/dist.rs | 2 +- - src/bootstrap/tool.rs | 2 +- + src/bootstrap/src/core/build_steps/dist.rs | 2 +- + src/bootstrap/src/core/build_steps/tool.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 32da4ac29a46..78a5faeae04b 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs +diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs +index c485481b9a1e..1a1b3a2ee39a 100644 +--- a/src/bootstrap/src/core/build_steps/dist.rs ++++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -423,7 +423,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { }, builder.kind, @@ -21,11 +21,11 @@ index 32da4ac29a46..78a5faeae04b 100644 } let libdir_relative = builder.libdir_relative(compiler); -diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index f094dd9d7c90..405ea571778c 100644 ---- a/src/bootstrap/tool.rs -+++ b/src/bootstrap/tool.rs -@@ -690,7 +690,7 @@ fn run(self, builder: &Builder<'_>) -> Option { +diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs +index d1bc05e51d73..6a7b788a3c4f 100644 +--- a/src/bootstrap/src/core/build_steps/tool.rs ++++ b/src/bootstrap/src/core/build_steps/tool.rs +@@ -691,7 +691,7 @@ fn run(self, builder: &Builder<'_>) -> Option { // Copy `rust-analyzer-proc-macro-srv` to `/libexec/` // so that r-a can use it. diff --git a/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch index edb12163b..3a0a45162 100644 --- a/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch +++ b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch @@ -4,14 +4,14 @@ Date: Thu, 13 Jul 2023 21:16:53 +0200 Subject: [PATCH] bootstrap: Change bash-completion dir --- - src/bootstrap/dist.rs | 6 +++++- + src/bootstrap/src/core/build_steps/dist.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 78a5faeae04b..4f4e4e508619 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -1079,7 +1079,11 @@ fn run(self, builder: &Builder<'_>) -> Option { +diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs +index 1a1b3a2ee39a..e3c334c37e05 100644 +--- a/src/bootstrap/src/core/build_steps/dist.rs ++++ b/src/bootstrap/src/core/build_steps/dist.rs +@@ -1071,7 +1071,11 @@ fn run(self, builder: &Builder<'_>) -> Option { tarball.add_file(&cargo, "bin", 0o755); tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); diff --git a/extra/rust/0003-compiler-Change-LLVM-targets.patch b/extra/rust/0003-compiler-Change-LLVM-targets.patch index 548e4e428..e9714b1b2 100644 --- a/extra/rust/0003-compiler-Change-LLVM-targets.patch +++ b/extra/rust/0003-compiler-Change-LLVM-targets.patch @@ -18,16 +18,16 @@ targets, as things break when this is done: (from `rustc --print target-list`) that best matches autoconf. --- compiler/rustc_session/src/config.rs | 2 +- - compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +- compiler/rustc_target/src/spec/mod.rs | 9 +++++++++ - .../rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +- + .../src/spec/targets/i686_unknown_linux_gnu.rs | 2 +- + .../src/spec/targets/x86_64_unknown_linux_gnu.rs | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs -index d29ab02c1a6a..ccd2c19a026e 100644 +index f745bc390cad..2f5e6ee95852 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs -@@ -2242,7 +2242,7 @@ pub fn parse_target_triple( +@@ -2240,7 +2240,7 @@ pub fn parse_target_triple( handler.early_error(format!("target file {path:?} does not exist")) }) } @@ -36,24 +36,11 @@ index d29ab02c1a6a..ccd2c19a026e 100644 _ => TargetTriple::from_triple(host_triple()), } } -diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -index 73e536a7e4d9..af48d437533c 100644 ---- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -@@ -9,7 +9,7 @@ pub fn target() -> Target { - base.stack_probes = StackProbeType::X86; - - Target { -- llvm_target: "i686-unknown-linux-gnu".into(), -+ llvm_target: "i686-pc-linux-gnu".into(), - pointer_width: 32, - data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\ - f64:32:64-f80:32-n8:16:32-S128" diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index 1bcb1f353159..7833125b454c 100644 +index f04799482c83..76e4930fbfdb 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -3267,6 +3267,15 @@ pub fn from_path(path: &Path) -> Result { +@@ -3488,6 +3488,15 @@ pub fn from_path(path: &Path) -> Result { Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents }) } @@ -69,10 +56,23 @@ index 1bcb1f353159..7833125b454c 100644 /// Returns a string triple for this target. /// /// If this target is a path, the file name (without extension) is returned. -diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs -index 2f970f87cc64..f8a5eec3ad6c 100644 ---- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs +index 0ca058b2fd2a..c3b34ad2a851 100644 +--- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs +@@ -9,7 +9,7 @@ pub fn target() -> Target { + base.stack_probes = StackProbeType::X86; + + Target { +- llvm_target: "i686-unknown-linux-gnu".into(), ++ llvm_target: "i686-pc-linux-gnu".into(), + pointer_width: 32, + data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\ + f64:32:64-f80:32-n8:16:32-S128" +diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs +index 80e267c163fa..c10da4b633f2 100644 +--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs @@ -17,7 +17,7 @@ pub fn target() -> Target { base.supports_xray = true; diff --git a/extra/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch b/extra/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch index b43582bf1..031a83ad1 100644 --- a/extra/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch +++ b/extra/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch @@ -5,14 +5,14 @@ Subject: [PATCH] compiler: Use wasm-ld for wasm targets We don't ship rust-lld. --- - compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- + compiler/rustc_target/src/spec/base/wasm.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs -index 341763aadbaf..dbb075affc18 100644 ---- a/compiler/rustc_target/src/spec/wasm_base.rs -+++ b/compiler/rustc_target/src/spec/wasm_base.rs -@@ -89,8 +89,7 @@ macro_rules! args { +diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs +index 87ade9e58cf4..542ad0aef849 100644 +--- a/compiler/rustc_target/src/spec/base/wasm.rs ++++ b/compiler/rustc_target/src/spec/base/wasm.rs +@@ -91,8 +91,7 @@ macro_rules! args { // arguments just yet limit_rdylib_exports: false, diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index 2a4f0a177..adecdda6d 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -20,7 +20,7 @@ pkgname=( rust-src ) epoch=1 -pkgver=1.74.1 +pkgver=1.75.0 pkgrel=1 pkgdesc="Systems programming language focused on safety, speed and concurrency" url=https://www.rust-lang.org/ @@ -64,12 +64,12 @@ source=( 0003-compiler-Change-LLVM-targets.patch 0004-compiler-Use-wasm-ld-for-wasm-targets.patch ) -b2sums=('71d86d8606ee06c44cd395a8fac73b6cdebd9c8993fdf9395e3f89bdd7fa480a273233f4c18e0823e889a2e5045354e1638d827e7c9d162c5101b3e6bb9af294' +b2sums=('6877d5bc89335be051639d21f723c1b596d83e837781ac691795ad3abf999e18c4fb07a2a9048da9ea860b3c4777cb2d49db7dc5081085da5f10888eebe0224e' 'SKIP' - 'b9591ca4b50ff4d825deeca1858a65ae6b25171e4a03f2fdee9a51e79590825e012af0592df63ecb7b27837d0959e7f0c4075dddddb42c8cc4ee98be451d0d12' - 'c8db828623b9bc2c9c34a4594f4c9409585c55815d0f3c0bf8b48ea2d3a01fe866c15850503ad5d3b6e04a6e68dd7e7f064d9745f4eb60a267fb90c7ad101d70' - 'a55aad4494907ea2f394754026b4ddff03a062a60ba92fc53aa6b6bcf3065807ca8df61ed1502e3873c114704533ae2790df1970cc4be44f8b89e1094be583b1' - 'e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117') + 'a55e8eca7d700f4dad9a09030cab97a5d7b28a56d4dfb03d75b09f66d04c05907a8e81df95af21f0caad12dcad17a292de55a4eb5eedf4f1a6d4a5f8dd053c83' + 'd3050f44d166530c65f98f0546fbbfe1f924789db66a9982d5e6591029355da6ce0a471c98bab153bcdff4ebe9cd68622e2b697694c880a875e2b5ca8f49822b' + '0a1d5e8709a73a4f0825231362c1cb0f6b4fdc72d0082f222da6479e6075e945fb041b43a57fbe2844247c9a2f148d335c723bdf0d92083c62f6c19f56ce5c0c' + '6a7d2ca75109de1a4b2aedc16f026bb97eaf00fa1ade67da92a48ce47b3d71a6403a349f73b3b4fb02dfde34bcbd6108510d7dd6f6a98eaf439521ab2205e52c') validpgpkeys=( 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) ) @@ -92,7 +92,7 @@ prepare() { cat >config.toml <