From b46f37e4204b0f41636c4ef4b501c31a415e56f7 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 16 Jul 2023 14:54:25 +0000 Subject: [PATCH] extra/rust to 1.71.0-1 --- .../0001-bootstrap-Change-libexec-dir.patch | 10 +++---- .../rust/0001-cargo-Change-libexec-dir.patch | 2 +- ...bootstrap-Change-bash-completion-dir.patch | 22 ++++++++++++++ ...> 0003-compiler-Change-LLVM-targets.patch} | 12 ++++---- ...mpiler-Use-wasm-ld-for-wasm-targets.patch} | 2 +- extra/rust/PKGBUILD | 30 ++++++++++--------- ...4E22316ABF4785A88C6E8EA2C794A986419D8A.asc | 29 ------------------ 7 files changed, 51 insertions(+), 56 deletions(-) create mode 100644 extra/rust/0002-bootstrap-Change-bash-completion-dir.patch rename extra/rust/{0002-compiler-Change-LLVM-targets.patch => 0003-compiler-Change-LLVM-targets.patch} (91%) rename extra/rust/{0003-compiler-Use-wasm-ld-for-wasm-targets.patch => 0004-compiler-Use-wasm-ld-for-wasm-targets.patch} (93%) delete mode 100644 extra/rust/keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc diff --git a/extra/rust/0001-bootstrap-Change-libexec-dir.patch b/extra/rust/0001-bootstrap-Change-libexec-dir.patch index 4f867447c..332e051dd 100644 --- a/extra/rust/0001-bootstrap-Change-libexec-dir.patch +++ b/extra/rust/0001-bootstrap-Change-libexec-dir.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" +From: "Jan Alexander Steffens (heftig)" Date: Thu, 6 May 2021 20:14:58 +0200 Subject: [PATCH] bootstrap: Change libexec dir @@ -9,7 +9,7 @@ Subject: [PATCH] bootstrap: Change libexec dir 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 76aad16c1fc2..ec516c76f95e 100644 +index b49845386da1..05e106637d74 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -420,7 +420,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { @@ -21,7 +21,7 @@ index 76aad16c1fc2..ec516c76f95e 100644 } let libdir_relative = builder.libdir_relative(compiler); -@@ -1073,7 +1073,7 @@ fn run(self, builder: &Builder<'_>) -> Option { +@@ -1082,7 +1082,7 @@ fn run(self, builder: &Builder<'_>) -> Option { for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") { let dirent = dirent.expect("read dir entry"); if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") { @@ -31,10 +31,10 @@ index 76aad16c1fc2..ec516c76f95e 100644 } diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index d1fd2e8c42cb..26e8a5b6fbc8 100644 +index b3791efaf58c..dd2e2eaea705 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs -@@ -851,7 +851,7 @@ fn run(self, builder: &Builder<'_>) -> Option { +@@ -719,7 +719,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/0001-cargo-Change-libexec-dir.patch b/extra/rust/0001-cargo-Change-libexec-dir.patch index b1ca50bf7..af0ece90d 100644 --- a/extra/rust/0001-cargo-Change-libexec-dir.patch +++ b/extra/rust/0001-cargo-Change-libexec-dir.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" +From: "Jan Alexander Steffens (heftig)" Date: Thu, 6 May 2021 20:13:31 +0200 Subject: [PATCH] cargo: Change libexec dir diff --git a/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch new file mode 100644 index 000000000..5a4cac388 --- /dev/null +++ b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Thu, 13 Jul 2023 21:16:53 +0200 +Subject: [PATCH] bootstrap: Change bash-completion dir + +--- + src/bootstrap/dist.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index 05e106637d74..426b1277fb23 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -1073,7 +1073,7 @@ fn run(self, builder: &Builder<'_>) -> Option { + tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); + tarball.add_renamed_file( + etc.join("cargo.bashcomp.sh"), +- "src/etc/bash_completion.d", ++ "share/bash-completion/completions", + "cargo", + ); + tarball.add_dir(etc.join("man"), "share/man/man1"); diff --git a/extra/rust/0002-compiler-Change-LLVM-targets.patch b/extra/rust/0003-compiler-Change-LLVM-targets.patch similarity index 91% rename from extra/rust/0002-compiler-Change-LLVM-targets.patch rename to extra/rust/0003-compiler-Change-LLVM-targets.patch index e6762e0e9..ff7915c60 100644 --- a/extra/rust/0002-compiler-Change-LLVM-targets.patch +++ b/extra/rust/0003-compiler-Change-LLVM-targets.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" +From: "Jan Alexander Steffens (heftig)" Date: Fri, 12 Mar 2021 17:31:56 +0100 Subject: [PATCH] compiler: Change LLVM targets @@ -24,11 +24,11 @@ targets, as things break when this is done: 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs -index 79eb31bb1050..69b49beb544a 100644 +index 6c8c8e484f93..a5e0f7125405 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs -@@ -1946,7 +1946,7 @@ pub fn parse_target_triple( - early_error(error_format, &format!("target file {path:?} does not exist")) +@@ -1989,7 +1989,7 @@ pub fn parse_target_triple( + early_error(error_format, format!("target file {path:?} does not exist")) }) } - Some(target) => TargetTriple::TargetTriple(target), @@ -50,10 +50,10 @@ index 73e536a7e4d9..af48d437533c 100644 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 4e5a821f0f6a..1813f299d7ac 100644 +index ba4b89c9ea10..bb9a28a18bb4 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -2982,6 +2982,15 @@ pub fn from_path(path: &Path) -> Result { +@@ -2984,6 +2984,15 @@ pub fn from_path(path: &Path) -> Result { Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents }) } diff --git a/extra/rust/0003-compiler-Use-wasm-ld-for-wasm-targets.patch b/extra/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch similarity index 93% rename from extra/rust/0003-compiler-Use-wasm-ld-for-wasm-targets.patch rename to extra/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch index 763a63b47..b43582bf1 100644 --- a/extra/rust/0003-compiler-Use-wasm-ld-for-wasm-targets.patch +++ b/extra/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" +From: "Jan Alexander Steffens (heftig)" Date: Sat, 6 Nov 2021 22:42:06 +0100 Subject: [PATCH] compiler: Use wasm-ld for wasm targets diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index e3879868f..e25c589a2 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -20,7 +20,7 @@ pkgname=( rust-src ) epoch=1 -pkgver=1.70.0 +pkgver=1.71.0 pkgrel=1 pkgdesc="Systems programming language focused on safety, speed and concurrency" url=https://www.rust-lang.org/ @@ -61,18 +61,19 @@ source=( "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} 0001-cargo-Change-libexec-dir.patch 0001-bootstrap-Change-libexec-dir.patch - 0002-compiler-Change-LLVM-targets.patch - 0003-compiler-Use-wasm-ld-for-wasm-targets.patch + 0002-bootstrap-Change-bash-completion-dir.patch + 0003-compiler-Change-LLVM-targets.patch + 0004-compiler-Use-wasm-ld-for-wasm-targets.patch ) -b2sums=('5b1fd44eaa10bf2ab76f64a3bb5c20ee4008031d05a49b0a32b3a9cb2e97d5684cf0c9a6b6883089afca6cab7a37a0a9cfa06d928ed3e6a3b6484b605e18a0f3' +b2sums=('43d5ec21eae1c1074c01ae0791940f4976ab2ec8a2754190e6a24cff62d5d29e0469a41e0aff36f264c57b5392042a4f415173a317088148e06f64095920aa34' 'SKIP' - '6de8373ee24ad9a5ae12b44a1288d474c8b8a1461ba54ccadbecefc87d034b6ef763b2909e2f1452fca30488504cabacad972c6ae78b240f74e47c0e01f25136' - '0b1c8f41144b2c9fc6528c67e6ac5ac0f4ccbbdddc3fd3ede0b83033f1745efc603c6dbc90eb64d0518832d8daf3f82e60bbcd042ff94effab1b5a499758dace' - '972b67b9ed47b9ff0d9f5156232ed63103a9d40617325ab99be000753c420a228a89a1ca098fa978fef14dc7eb11bb222b85d63a5d2aec444b8ebfdfca07fc67' - '445802d26028848549781b9be7430f2f1cedcd0d1f960c61dbce870a66a867aff3b0c9905b4f81b6cefefd74d83a868742ec735dd9046943068ac98117d22987') + 'd6b399d094d2c546d6fc53245e640dfb70921e250035b729bedc353a342de9daed167012810a47f4a2da3e0b70e31f89eeb02915870856ef2285a50a9553f14d' + 'b6c4ad33d54522b2b2f39459877ae05595622e424177e7b6a5e2743058aff3c8bf315b7020eae5460888266700d54c1f59983671aff4da53643bec80cd36b599' + '29873e73c52d2c02cfca5b29abc7f2477e98d5cfc3ca1c5c565a04eb925f483ac22dd98a2433a06817742daaa5f3984cc1bd695d3f6b610a41c030be18dd8257' + '2ecae93bc6323ef8285b590d576f8b7de385dc121317bd108e1e0863e0ef57d6bd7529564342443b182f1979d2e432a105998da61db16be8e6ea24f79c9acfcd' + 'e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117') validpgpkeys=( 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) - 474E22316ABF4785A88C6E8EA2C794A986419D8A # Tom Stellard ) prepare() { @@ -83,11 +84,14 @@ prepare() { patch -d src/tools/cargo -Np1 < ../0001-cargo-Change-libexec-dir.patch patch -Np1 -i ../0001-bootstrap-Change-libexec-dir.patch + # Put bash completions where they belong + patch -Np1 -i ../0002-bootstrap-Change-bash-completion-dir.patch + # Use our *-pc-linux-gnu targets, making LTO with clang simpler - patch -Np1 -i ../0002-compiler-Change-LLVM-targets.patch + patch -Np1 -i ../0003-compiler-Change-LLVM-targets.patch # Use our wasm-ld - patch -Np1 -i ../0003-compiler-Use-wasm-ld-for-wasm-targets.patch + patch -Np1 -i ../0004-compiler-Use-wasm-ld-for-wasm-targets.patch cat >config.toml <