Skip to content

Commit c109e04

Browse files
committed
rust: update 1.65.0 -> 1.66.0
Drop backported patch ENOTSUP constant for riscv32/musl. Release notes: https://blog.rust-lang.org/2022/12/15/Rust-1.66.0.html License-Update: Upstream has added Unicode Terms of Use license (Unicode-TOU). Signed-off-by: Alex Kiernan <[email protected]>
1 parent c12f9b8 commit c109e04

13 files changed

+38
-152
lines changed

recipes-devtools/rust/libstd-rs.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
SUMMARY = "Rust standard libaries"
22
HOMEPAGE = "http://www.rust-lang.org"
33
SECTION = "devel"
4-
LICENSE = "MIT | Apache-2.0"
5-
LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
4+
LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
5+
LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=92289ed52a60b63ab715612ad2915603"
66

77
RUSTLIB_DEP = ""
88
inherit cargo

recipes-devtools/rust/rust-snapshot.inc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
## The version is replicated here.
66
## TODO: find a way to add additional SRC_URIs based on the contents of an
77
## earlier SRC_URI.
8-
RS_VERSION = "1.64.0"
9-
CARGO_VERSION = "1.64.0"
8+
RS_VERSION = "1.65.0"
9+
CARGO_VERSION = "1.65.0"
1010

1111
# TODO: Add hashes for other architecture toolchains as well. Make a script?
12-
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b"
13-
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0"
14-
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41"
12+
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9"
13+
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "62b89786e195fc5a8a262f83118d6689832b24228c9d303cba8ac14dc1e9adc8"
14+
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "82547aacaf42fc3c2970ec31b96751dfbeba3dffe1a042a3780bd670c29a89bf"
1515

16-
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "40abc9ec4f86ff0e37ba176e4c68dfa708e9857bb0372169c865367593127566"
17-
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "8f10b379bcc8caaab983b7d04a3f105dae42f95718f231b46d7e68685d239191"
18-
SRC_URI[cargo-snapshot-aarch64.sha256sum] = "103d69e4f2f49f5a6309d7d195747b31f94cf707f90fb49cf76039a5ce6295c7"
16+
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad"
17+
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "67c3d3545fd898c1383071c0f6296453565e0da10903c50652d7bf679b53e8a2"
18+
SRC_URI[cargo-snapshot-aarch64.sha256sum] = "3fd483c0d58673ab69862824408c8a48612827ddcdeaaca0f8fbe5ca02214a4c"
1919

20-
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738"
21-
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "11630fc51fffe722e52f649357b5948c24b5305cfb61a8114527234e054451c4"
22-
SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "ba7188b2c7890e61bf58d3aa9e94c323fec375f67cf03841bbcc0f6c800fe6ad"
20+
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6"
21+
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "a6ce7aadd10a3fd84fe4717a59378421a65b101b61f27eed8b09336b8daf62cf"
22+
SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "9393de910df7cd6947e380460a1144ac2373a36c776c7367a81212a51a92d9a7"
2323

2424
SRC_URI += " \
2525
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \

recipes-devtools/rust/rust-source.inc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
2-
SRC_URI[rust.sha256sum] = "2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf"
2+
SRC_URI[rust.sha256sum] = "0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c"
33

44
SRC_URI:append:class-target:pn-rust = " \
55
file://hardcodepaths.patch \
6-
file://crossbeam_atomic.patch \
7-
file://0001-Add-ENOTSUP-constant-for-riscv32-musl.patch"
6+
file://crossbeam_atomic.patch"
87
SRC_URI:append:class-nativesdk:pn-nativesdk-rust = " file://hardcodepaths.patch"
98

109
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"

recipes-devtools/rust/rust.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
SUMMARY = "Rust compiler and runtime libaries"
22
HOMEPAGE = "http://www.rust-lang.org"
33
SECTION = "devel"
4-
LICENSE = "MIT | Apache-2.0"
5-
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
4+
LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
5+
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=92289ed52a60b63ab715612ad2915603"
66

77
inherit rust
88
inherit cargo_common

recipes-devtools/rust/rust/0001-Add-ENOTSUP-constant-for-riscv32-musl.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

recipes-devtools/rust/rust/crossbeam_atomic.patch

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

recipes-devtools/rust/rust/crossbeam_atomic.patch.orig

Lines changed: 0 additions & 81 deletions
This file was deleted.

recipes-devtools/rust/rust/hardcodepaths.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ to resolve these issues properly upstream.
55
Upstream-Status: Inappropriate [patches need rework]
66
Signed-off-by: Richard Purdie <[email protected]>
77

8-
Index: rustc-1.65.0-src/src/tools/clippy/src/driver.rs
8+
Index: rustc-1.66.0-src/src/tools/clippy/src/driver.rs
99
===================================================================
10-
--- rustc-1.65.0-src.orig/src/tools/clippy/src/driver.rs
11-
+++ rustc-1.65.0-src/src/tools/clippy/src/driver.rs
10+
--- rustc-1.66.0-src.orig/src/tools/clippy/src/driver.rs
11+
+++ rustc-1.66.0-src/src/tools/clippy/src/driver.rs
1212
@@ -259,7 +259,6 @@ pub fn main() {
1313
.and_then(|out| String::from_utf8(out.stdout).ok())
1414
.map(|s| PathBuf::from(s.trim()))
@@ -17,11 +17,11 @@ Index: rustc-1.65.0-src/src/tools/clippy/src/driver.rs
1717
.or_else(|| {
1818
let home = option_env!("RUSTUP_HOME")
1919
.or(option_env!("MULTIRUST_HOME"))
20-
Index: rustc-1.65.0-src/compiler/rustc_codegen_llvm/src/context.rs
20+
Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
2121
===================================================================
22-
--- rustc-1.65.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs
23-
+++ rustc-1.65.0-src/compiler/rustc_codegen_llvm/src/context.rs
24-
@@ -155,46 +155,6 @@ pub unsafe fn create_module<'ll>(
22+
--- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs
23+
+++ rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
24+
@@ -160,46 +160,6 @@ pub unsafe fn create_module<'ll>(
2525
}
2626
}
2727

0 commit comments

Comments
 (0)