rust: Upgrade 1.68.2 -> 1.69.0
PATCH 1/1 rust: Upgrade 1.68.2 -> 1.69.0
Rebase patches, drop crossbeam_atomic is this fully merged upstream.
https://blog.rust-lang.org/2023/04/20/Rust-1.69.0.html
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../rust/{cargo_1.68.2.bb => cargo_1.69.0.bb} | 0
...-Do-not-use-LFS64-on-linux-with-musl.patch | 59 ++++++++---------
...efine-SOCK_SEQPACKET-in-common-place.patch | 52 ++++++++++-----
.../rust/files/crossbeam_atomic.patch | 50 --------------
.../rust/files/hardcodepaths.patch | 11 ++--
...ibstd-rs_1.68.2.bb => libstd-rs_1.69.0.bb} | 0
....68.2.bb => rust-cross-canadian_1.69.0.bb} | 0
...ust-llvm_1.68.2.bb => rust-llvm_1.69.0.bb} | 0
meta/recipes-devtools/rust/rust-snapshot.inc | 66 +++++++++----------
meta/recipes-devtools/rust/rust-source.inc | 3 +-
.../rust/{rust_1.68.2.bb => rust_1.69.0.bb} | 0
12 files changed, 100 insertions(+), 143 deletions(-)
rename meta/recipes-devtools/rust/{cargo_1.68.2.bb => cargo_1.69.0.bb} (100%)
delete mode 100644 meta/recipes-devtools/rust/files/crossbeam_atomic.patch
rename meta/recipes-devtools/rust/{libstd-rs_1.68.2.bb => libstd-rs_1.69.0.bb} (100%)
rename meta/recipes-devtools/rust/{rust-cross-canadian_1.68.2.bb => rust-cross-canadian_1.69.0.bb} (100%)
rename meta/recipes-devtools/rust/{rust-llvm_1.68.2.bb => rust-llvm_1.69.0.bb} (100%)
rename meta/recipes-devtools/rust/{rust_1.68.2.bb => rust_1.69.0.bb} (100%)meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.1%" QEMUVERSION ?= "7.2%" GOVERSION ?= "1.20%" LLVMVERSION ?= "15.%" -RUSTVERSION ?= "1.68%" +RUSTVERSION ?= "1.69%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-devtools/rust/cargo_1.69.0.bb renamed from meta/recipes-devtools/rust/cargo_1.68.2.bb +0 -0
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch +26 -33
130 lines not on this page · raw message
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch +34 -18
99 lines not on this page · raw message
meta/recipes-devtools/rust/files/crossbeam_atomic.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-devtools/rust/files/hardcodepaths.patch +5 -6
@@ -4,12 +4,11 @@ to resolve these issues properly upstream. Upstream-Status: Inappropriate [patches need rework] Signed-off-by: Richard Purdie <[email protected]> +Signed-off-by: Alex Kiernan <[email protected]> -Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs -=================================================================== ---- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs -+++ rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs -@@ -160,46 +160,6 @@ pub unsafe fn create_module<'ll>( +--- rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs.orig 2023-04-21 08:38:23.092458478 +0100 ++++ rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs 2023-04-21 08:39:00.266819755 +0100 +@@ -156,46 +156,6 @@ } }
@@ -39,7 +38,7 @@ Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs - // - // FIXME(#34960) - let cfg_llvm_root = option_env!("CFG_LLVM_ROOT").unwrap_or(""); -- let custom_llvm_used = cfg_llvm_root.trim() != ""; +- let custom_llvm_used = !cfg_llvm_root.trim().is_empty(); - - if !custom_llvm_used && target_data_layout != llvm_data_layout { - bug!(
meta/recipes-devtools/rust/libstd-rs_1.69.0.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.68.2.bb +0 -0
meta/recipes-devtools/rust/rust-cross-canadian_1.69.0.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.68.2.bb +0 -0
meta/recipes-devtools/rust/rust-llvm_1.69.0.bb renamed from meta/recipes-devtools/rust/rust-llvm_1.68.2.bb +0 -0
meta/recipes-devtools/rust/rust-snapshot.inc +33 -33
84 lines not on this page · raw message
meta/recipes-devtools/rust/rust-source.inc +1 -2
@@ -1,14 +1,13 @@ RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}" SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \ - file://crossbeam_atomic.patch;patchdir=${RUSTSRC} \ file://hardcodepaths.patch;patchdir=${RUSTSRC} \ file://getrandom-open64.patch;patchdir=${RUSTSRC} \ file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \ file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "ce1a115f6aafa912b4622906a92b626354973afa9288e2c7750df4dcf3390fc0" +SRC_URI[rust.sha256sum] = "e533c903820b0c2ba10491b70105149d2243348f3b5e26bd7b6bdd022c7dbe75" RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
meta/recipes-devtools/rust/rust_1.69.0.bb renamed from meta/recipes-devtools/rust/rust_1.68.2.bb +0 -0
Signature · 1 line
2.39.0
Hello Alex,
Quoted 5 lines · On Tue, 25 Apr 2023 21:31:15 +0100 "Alex Kiernan" <[email protected]>…
Rebase patches, drop
crossbeam_atomicis this fully merged upstream.https://blog.rust-lang.org/2023/04/20/Rust-1.69.0.html
Signed-off-by Alex Kiernan <[email protected]>
musl-qemu AB tests fail with this patch:
ERROR: rust-1.69.0-r0 do_install: ExecutionError('/home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/rust/1.69.0-r0/temp/run.do_install.498791', 1, None, None) | error: unused import: libc::fstatat64
| error: could not compile std due to previous error
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/7013/steps/11/logs/stdio
Best regards,
Luca
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 12 lines · Luca Ceresoli
Hello Alex,
Quoted 5 lines · On Tue, 25 Apr 2023 21:31:15 +0100 "Alex Kiernan" <[email protected]>…
Rebase patches, drop
crossbeam_atomicis this fully merged upstream.https://blog.rust-lang.org/2023/04/20/Rust-1.69.0.html
Signed-off-by Alex Kiernan <[email protected]>
Quoted 8 lines
musl-qemu AB tests fail with this patch:
ERROR: rust-1.69.0-r0
do_install: ExecutionError('/home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/rust/1.69.0-r0/temp/run.do_install.498791', 1, None, None) | error: unused import:libc::fstatat64
| error: could not compilestddue to previous errorhttps://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/7013/steps/11/logs/stdio
Thanks, will have a look.
Signature · 1 line
Alex Kiernan