From f87ec16ff49719ce2e301293c1825062cf7381c7 Mon Sep 17 00:00:00 2001 From: Luis Date: Fri, 29 Dec 2023 06:51:48 +0000 Subject: [PATCH] rust: upgrade to 1.75.0 --- main/rust/.checksums | 15 ++--- main/rust/.pkgfiles | 67 +++++++++---------- .../0001-bootstrap-Change-libexec-dir.patch | 26 +++---- main/rust/0001-cargo-Change-libexec-dir.patch | 22 ------ ...bootstrap-Change-bash-completion-dir.patch | 26 ------- ...> 0002-compiler-Change-LLVM-targets.patch} | 49 ++++---------- ...ompiler-Use-wasm-ld-for-wasm-targets.patch | 14 +--- main/rust/spkgbuild | 24 +++---- 8 files changed, 71 insertions(+), 172 deletions(-) delete mode 100644 main/rust/0001-cargo-Change-libexec-dir.patch delete mode 100644 main/rust/0002-bootstrap-Change-bash-completion-dir.patch rename main/rust/{0003-compiler-Change-LLVM-targets.patch => 0002-compiler-Change-LLVM-targets.patch} (53%) diff --git a/main/rust/.checksums b/main/rust/.checksums index f9ba889af..260291318 100644 --- a/main/rust/.checksums +++ b/main/rust/.checksums @@ -1,9 +1,8 @@ -d715c8553cec6f773a0f764ea4ee75d5 0001-bootstrap-Change-libexec-dir.patch -7a32fe5e0764a614f196631082ae1fe4 0002-bootstrap-Change-bash-completion-dir.patch -1be5c14bcf628bccaeccb607217ad0f1 0003-compiler-Change-LLVM-targets.patch -ddbc0b79f535ccf85f2492900fe8597e 0004-compiler-Use-wasm-ld-for-wasm-targets.patch +5a0b11e0bc8abe2369f83cde6ea265a9 0001-bootstrap-Change-libexec-dir.patch +968d7afec16f7693b5e00daaf3871d5b 0002-compiler-Change-LLVM-targets.patch +d625886fd507b8b69686819d9a4684f4 0004-compiler-Use-wasm-ld-for-wasm-targets.patch 2afbe7df2d8112064d87ddc4895a09ce 0005-lang-rust-Allow-build-with-LibreSSL-3.8.2.patch -439baa0ea9b575f00b487f264e17821f cargo-1.73.0-x86_64-unknown-linux-gnu.tar.xz -68977aad99501265e46bf1234dea57f1 rust-std-1.73.0-x86_64-unknown-linux-gnu.tar.xz -c97ec96a102a2f5353f6f792496682a3 rustc-1.73.0-x86_64-unknown-linux-gnu.tar.xz -ed0a20a070a3470b63bc612c82ea23fa rustc-1.74.1-src.tar.xz +191fe26848a1fb63c74eaffbc7aeb9f9 cargo-1.74.0-x86_64-unknown-linux-gnu.tar.xz +227aa6be06af8d5e9fc4b857cb7502db rust-std-1.74.0-x86_64-unknown-linux-gnu.tar.xz +df9105c4720f24d1530cfd3d496f81e5 rustc-1.74.0-x86_64-unknown-linux-gnu.tar.xz +62d794105a8c98923a67e6d9ce032be0 rustc-1.75.0-src.tar.xz diff --git a/main/rust/.pkgfiles b/main/rust/.pkgfiles index 46a7cd3b5..75c93eb86 100644 --- a/main/rust/.pkgfiles +++ b/main/rust/.pkgfiles @@ -1,4 +1,4 @@ -rust-1.74.1-2 +rust-1.75.0-1 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cargo @@ -16,9 +16,9 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rustfmt -rwxr-xr-x root/root usr/bin/rustfmt.old drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/librustc_driver-38fa225e1c474c87.so --rw-r--r-- root/root usr/lib/libstd-d0b6e23763503fda.so --rw-r--r-- root/root usr/lib/libtest-85c70c1c14f649f9.so +-rw-r--r-- root/root usr/lib/librustc_driver-02813a25d45639a4.so +-rw-r--r-- root/root usr/lib/libstd-18656e6b63c3a2ed.so +-rw-r--r-- root/root usr/lib/libtest-76744ab56a4e42e0.so drwxr-xr-x root/root usr/lib/rustlib/ drwxr-xr-x root/root usr/lib/rustlib/etc/ -rw-r--r-- root/root usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py @@ -36,38 +36,35 @@ drwxr-xr-x root/root usr/lib/rustlib/etc/ -rwxr-xr-x root/root usr/lib/rustlib/uninstall.sh drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/ drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/ --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-d73f546936b2628c.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-1310f6b0b047751f.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-99899efdd2c50e32.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-4d1be697dcd57912.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-e0498a72bcccbdb0.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-fe1acddfaae1e575.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-29184869598a7f33.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-b9058e2f8ae9ab61.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-380171a2d83127e5.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-38ae24c9e59d49cf.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-e990a2ee5ad9c845.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-cda7ae0a539fd056.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-92c1c2a3e9f161cb.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-fc52b4f5861407dd.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-f8268cd701e7b553.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-80aa6869fb053397.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-249161c9d7f34ff0.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-178f62b083eb9dad.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-8e1b69334c221f67.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-bb9aa8eb842fa51f.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-d0b6e23763503fda.rlib --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-d0b6e23763503fda.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-1c73aaea29c8bf20.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsysroot-b8a4b8cbe824c6b4.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-85c70c1c14f649f9.rlib --rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-85c70c1c14f649f9.so --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-2f57b157f61dde42.rlib --rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-c3fbca6c55d80395.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-b5d23f3f5916248c.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-a6a216b62da90de5.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-a45b7fc7270ca09b.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-088736bd7313bc3e.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-42a6668cfaa05364.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-97f2d04036fb86e6.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-1c9349e0f26c6f89.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-e3994a26aa92d4d7.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-ae2fd94705b0f807.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f5f732b6886ffce4.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-cd293ece0e7a6632.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-9a8c53eac9a28ccf.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-e118688830f51bc9.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-75e64a026388ddb2.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-0a8ef496e127a8cb.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-2e24edfcb9f22be0.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-953739d0a6821a4c.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-b047d0a9bd9efae4.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-d77df9a81568fcdb.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-3441b6601724d7e8.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-18656e6b63c3a2ed.rlib +-rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-18656e6b63c3a2ed.so +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-33dffa8ca92962ad.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsysroot-b6f4c32f67bf58bd.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-76744ab56a4e42e0.rlib +-rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-76744ab56a4e42e0.so +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-0bacc6b859b713d6.rlib +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-3c7124e106f81554.rlib drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/bash-completion/ -drwxr-xr-x root/root usr/share/bash-completion/completions/ --rw-r--r-- root/root usr/share/bash-completion/completions/cargo drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/cargo-add.1.gz diff --git a/main/rust/0001-bootstrap-Change-libexec-dir.patch b/main/rust/0001-bootstrap-Change-libexec-dir.patch index f76c70d6e..fe6b65f19 100644 --- a/main/rust/0001-bootstrap-Change-libexec-dir.patch +++ b/main/rust/0001-bootstrap-Change-libexec-dir.patch @@ -1,17 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -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 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git 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 32da4ac29a46..78a5faeae04b 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs +--- 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 +11,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 e6d27757ac66..70e499bdabbe 100644 +--- a/src/bootstrap/src/core/build_steps/tool.rs ++++ b/src/bootstrap/src/core/build_steps/tool.rs +@@ -689,7 +689,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/main/rust/0001-cargo-Change-libexec-dir.patch b/main/rust/0001-cargo-Change-libexec-dir.patch deleted file mode 100644 index 2fa80a719..000000000 --- a/main/rust/0001-cargo-Change-libexec-dir.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Thu, 6 May 2021 20:13:31 +0200 -Subject: [PATCH] cargo: Change libexec dir - ---- - src/cargo/util/auth/mod.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cargo/util/auth/mod.rs b/src/cargo/util/auth/mod.rs -index 58309964f493..f621e1d643c4 100644 ---- a/src/cargo/util/auth/mod.rs -+++ b/src/cargo/util/auth/mod.rs -@@ -711,7 +711,7 @@ fn sysroot_credential( - .parent() - .and_then(|p| p.parent()) - .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?; -- let exe = root.join("libexec").join(format!( -+ let exe = root.join("lib").join(format!( - "cargo-credential-{}{}", - cred_name, - std::env::consts::EXE_SUFFIX diff --git a/main/rust/0002-bootstrap-Change-bash-completion-dir.patch b/main/rust/0002-bootstrap-Change-bash-completion-dir.patch deleted file mode 100644 index edb12163b..000000000 --- a/main/rust/0002-bootstrap-Change-bash-completion-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 | 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 { - - tarball.add_file(&cargo, "bin", 0o755); - tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); -- tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo"); -+ tarball.add_renamed_file( -+ etc.join("cargo.bashcomp.sh"), -+ "share/bash-completion/completions", -+ "cargo", -+ ); - tarball.add_dir(etc.join("man"), "share/man/man1"); - tarball.add_legal_and_readme_to("share/doc/cargo"); - diff --git a/main/rust/0003-compiler-Change-LLVM-targets.patch b/main/rust/0002-compiler-Change-LLVM-targets.patch similarity index 53% rename from main/rust/0003-compiler-Change-LLVM-targets.patch rename to main/rust/0002-compiler-Change-LLVM-targets.patch index 548e4e428..5058a82d0 100644 --- a/main/rust/0003-compiler-Change-LLVM-targets.patch +++ b/main/rust/0002-compiler-Change-LLVM-targets.patch @@ -1,34 +1,9 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Fri, 12 Mar 2021 17:31:56 +0100 -Subject: [PATCH] compiler: Change LLVM targets - - - Change x86_64-unknown-linux-gnu to use x86_64-pc-linux-gnu - - Change i686-unknown-linux-gnu to use i686-pc-linux-gnu - -Reintroduce the aliasing that was removed in 1.52.0 and alias the -pc- -triples to the -unknown- triples. This avoids defining proper -pc- -targets, as things break when this is done: - - - The crate ecosystem expects the -unknown- targets. Making -pc- - rustc's host triple (and thus default target) would break various - crates. - - Firefox's build breaks when the host triple (from - `rustc --version --verbose`) is different from the target triple - (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 +- - 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 f2ee52262ade..6a813c4b8707 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs -@@ -2242,7 +2242,7 @@ pub fn parse_target_triple( - handler.early_error(format!("target file {path:?} does not exist")) +@@ -1832,7 +1832,7 @@ pub fn parse_target_triple( + early_error(error_format, &format!("target file {path:?} does not exist")) }) } - Some(target) => TargetTriple::TargetTriple(target), @@ -38,8 +13,8 @@ index d29ab02c1a6a..ccd2c19a026e 100644 } 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 +--- 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; @@ -50,10 +25,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 1bcb1f353159..7833125b454c 100644 +index 8909cf33af91..e5b5bce4c290 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 { +@@ -2876,6 +2876,15 @@ pub fn from_path(path: &Path) -> Result { Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents }) } @@ -70,11 +45,11 @@ index 1bcb1f353159..7833125b454c 100644 /// /// 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 -@@ -17,7 +17,7 @@ pub fn target() -> Target { - base.supports_xray = true; +index a91ab365b668..d605eb9ccf81 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 +@@ -14,7 +14,7 @@ pub fn target() -> Target { + | SanitizerSet::THREAD; Target { - llvm_target: "x86_64-unknown-linux-gnu".into(), diff --git a/main/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch b/main/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch index b43582bf1..269b75215 100644 --- a/main/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch +++ b/main/rust/0004-compiler-Use-wasm-ld-for-wasm-targets.patch @@ -1,17 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sat, 6 Nov 2021 22:42:06 +0100 -Subject: [PATCH] compiler: Use wasm-ld for wasm targets - -We don't ship rust-lld. ---- - compiler/rustc_target/src/spec/wasm_base.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 +--- a/compiler/rustc_target/src/spec/base/wasm.rs ++++ b/compiler/rustc_target/src/spec/base/wasm.rs @@ -89,8 +89,7 @@ macro_rules! args { // arguments just yet limit_rdylib_exports: false, diff --git a/main/rust/spkgbuild b/main/rust/spkgbuild index f70f13905..044f27f9f 100755 --- a/main/rust/spkgbuild +++ b/main/rust/spkgbuild @@ -2,11 +2,11 @@ # depends : curl cmake python3 llvm libssh2 name=rust -version=1.74.1 -#2023-11-16 -release=2 -_date=2023-10-05 -_rust=1.73.0 +version=1.75.0 +#2023-12-28 +release=1 +_date=2023-11-16 +_rust=1.74.0 _cargo=$_rust _triplet=x86_64-unknown-linux-gnu @@ -15,8 +15,7 @@ source="https://static.rust-lang.org/dist/rustc-$version-src.tar.xz https://static.rust-lang.org/dist/$_date/rustc-$_rust-$_triplet.tar.xz https://static.rust-lang.org/dist/$_date/cargo-$_cargo-$_triplet.tar.xz 0001-bootstrap-Change-libexec-dir.patch - 0002-bootstrap-Change-bash-completion-dir.patch - 0003-compiler-Change-LLVM-targets.patch + 0002-compiler-Change-LLVM-targets.patch 0004-compiler-Use-wasm-ld-for-wasm-targets.patch 0005-lang-rust-Allow-build-with-LibreSSL-3.8.2.patch" @@ -31,20 +30,17 @@ build() { # Patch bootstrap so that rust-analyzer-proc-macro-srv # is in /usr/lib instead of /usr/libexec - 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 + patch -Np1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch # Use our *-pc-linux-gnu targets, making LTO with clang simpler - patch -Np1 -i ../0003-compiler-Change-LLVM-targets.patch + patch -Np1 -i $SRC/0002-compiler-Change-LLVM-targets.patch # Use our wasm-ld - patch -Np1 -i ../0004-compiler-Use-wasm-ld-for-wasm-targets.patch + patch -Np1 -i $SRC/0004-compiler-Use-wasm-ld-for-wasm-targets.patch # Fix build for libressl users # Thanks to freebsd for this patch - patch -Np1 -i ../0005-lang-rust-Allow-build-with-LibreSSL-3.8.2.patch + patch -Np1 -i $SRC/0005-lang-rust-Allow-build-with-LibreSSL-3.8.2.patch mkdir -p build/cache/$_date