From 08ad33e1e2c10e19a6d221e083ad50e8c487b679 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 12 Mar 2023 17:56:16 +0000 Subject: [PATCH] extra/rust to 1.68.0-1 --- extra/rust/0001-bootstrap-Change-libexec-dir.patch | 10 +++++----- extra/rust/0001-cargo-Change-libexec-dir.patch | 4 ++-- extra/rust/0002-compiler-Change-LLVM-targets.patch | 8 ++++---- extra/rust/PKGBUILD | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/extra/rust/0001-bootstrap-Change-libexec-dir.patch b/extra/rust/0001-bootstrap-Change-libexec-dir.patch index c315b0663..12bde19d3 100644 --- a/extra/rust/0001-bootstrap-Change-libexec-dir.patch +++ b/extra/rust/0001-bootstrap-Change-libexec-dir.patch @@ -9,10 +9,10 @@ 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 3cb0eccd324d..c4a76921fd06 100644 +index 6594b23c56b0..2e6a96ba4d79 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs -@@ -403,7 +403,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { +@@ -404,7 +404,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { target: compiler.host, }) .expect("rust-analyzer-proc-macro-server always builds"); @@ -21,7 +21,7 @@ index 3cb0eccd324d..c4a76921fd06 100644 let libdir_relative = builder.libdir_relative(compiler); -@@ -1046,7 +1046,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { +@@ -1047,7 +1047,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { 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 3cb0eccd324d..c4a76921fd06 100644 } diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index e0be4c432f16..410e787616dd 100644 +index 9a2100c2fb78..d51b1ff8449e 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs -@@ -783,7 +783,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> { +@@ -792,7 +792,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> { // Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/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 8055c10ac..e988e588d 100644 --- a/extra/rust/0001-cargo-Change-libexec-dir.patch +++ b/extra/rust/0001-cargo-Change-libexec-dir.patch @@ -8,10 +8,10 @@ Subject: [PATCH] cargo: Change libexec dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/util/auth.rs b/src/cargo/util/auth.rs -index d67f874f132b..407da5a2538d 100644 +index 467abc2635a0..30232251b3a2 100644 --- a/src/cargo/util/auth.rs +++ b/src/cargo/util/auth.rs -@@ -476,7 +476,7 @@ fn sysroot_credential( +@@ -817,7 +817,7 @@ fn sysroot_credential( .parent() .and_then(|p| p.parent()) .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?; diff --git a/extra/rust/0002-compiler-Change-LLVM-targets.patch b/extra/rust/0002-compiler-Change-LLVM-targets.patch index 6148da4f9..8fac6336e 100644 --- a/extra/rust/0002-compiler-Change-LLVM-targets.patch +++ b/extra/rust/0002-compiler-Change-LLVM-targets.patch @@ -24,10 +24,10 @@ 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 7a20100fd313..33fc4c54b65c 100644 +index 586454f76574..b831e9c4e18f 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs -@@ -1853,7 +1853,7 @@ pub fn parse_target_triple( +@@ -1887,7 +1887,7 @@ pub fn parse_target_triple( early_error(error_format, &format!("target file {path:?} does not exist")) }) } @@ -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 d05b8aa42006..3cbf2f5d5bfc 100644 +index a094c2c54526..610241905ea8 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -2944,6 +2944,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> { +@@ -2952,6 +2952,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> { Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents }) } diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index 6e64919b3..8f29ea57c 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -17,7 +17,7 @@ highmem=1 pkgbase=rust pkgname=(rust rust-src) epoch=1 -pkgver=1.67.1 +pkgver=1.68.0 pkgrel=1 pkgdesc="Systems programming language focused on safety, speed and concurrency" url=https://www.rust-lang.org/ @@ -58,12 +58,12 @@ source=( 0002-compiler-Change-LLVM-targets.patch 0003-compiler-Use-wasm-ld-for-wasm-targets.patch ) -sha256sums=('46483d3e5de85a3bd46f8e7a3ae1837496391067dbe713a25d3cf051b3d9ff6e' - 'SKIP' - 'b2ef8c3bca5d72ed58ff8930e69947602f875a639c2b01de5943b1ecb1b5c3c3' - '6a4e09671cd96a854cf0fc9a1f43651ac5a0fdc8dca571730131ae272b630cfe' - 'e32fd355330e6c1ca4f0c630a3e254d261c48516128243a5d5d49f612cd217ed' - 'f83bf98daee94d3e592fd2d96eecc25dc92b6b20575a3e3df7841a90a5b9f965') +b2sums=('cff56d29a5325cfcc5a50d492f73c15d92434bfdfd5cabfa84be61f815e546d4ac8786c00c1db668e6c8216e1c00d898ef448f6cfd7ea2ffdeaf1a51de68b124' + 'SKIP' + 'dce1c2340b172753b9d56dcc9d401e4cd9c66d64721c97e256974c18f17b0489e65e3732ef4e15538ea6e07c34f1269775a51c0c7c72e63a62f41ff258ce9ec2' + '01dee52ef899c0545cde37b5e1ba3ecfd5def3785145ed9f440df12945885311b63ff974294c1efed65b25b01bdb5cea37d7830e8d9775daefec8c1bcd3e159b' + '66c5cf262c4b865cdcc238d88aad4aa46e0861de0b4e20b5e86f7f1c312f7a40df0f9477fbc494949a99f51e9eb93537c072270e9bd20dfa79eb5cbe0d850e0f' + '9f3f911088a22101f8966dc16a1ecc65da5facaad5c169d9464e721aa452dd45968d359a5b35ae74ff23bd98d44c60cb04c0b8bc89e10fb99549c1670371c902') validpgpkeys=(108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> 474E22316ABF4785A88C6E8EA2C794A986419D8A) # Tom Stellard <tstellar@redhat.com>