From 855ec0af1b3c7c2664e68ac89cad839d480c43db Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 27 Jan 2022 11:20:00 +0100 Subject: rust: update 1.58.0 -> 1.58.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/libstd-rs_1.58.0.bb | 12 ------------ meta/recipes-devtools/rust/libstd-rs_1.58.1.bb | 12 ++++++++++++ .../rust/rust-cross-canadian_1.58.0.bb | 6 ------ .../rust/rust-cross-canadian_1.58.1.bb | 6 ++++++ meta/recipes-devtools/rust/rust-cross_1.58.0.bb | 2 -- meta/recipes-devtools/rust/rust-cross_1.58.1.bb | 2 ++ meta/recipes-devtools/rust/rust-llvm_1.58.0.bb | 5 ----- meta/recipes-devtools/rust/rust-llvm_1.58.1.bb | 6 ++++++ meta/recipes-devtools/rust/rust-source.inc | 2 +- .../rust/rust-tools-cross-canadian_1.58.0.bb | 6 ------ .../rust/rust-tools-cross-canadian_1.58.1.bb | 6 ++++++ meta/recipes-devtools/rust/rust_1.58.0.bb | 21 --------------------- meta/recipes-devtools/rust/rust_1.58.1.bb | 21 +++++++++++++++++++++ 13 files changed, 54 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-devtools/rust/libstd-rs_1.58.0.bb create mode 100644 meta/recipes-devtools/rust/libstd-rs_1.58.1.bb delete mode 100644 meta/recipes-devtools/rust/rust-cross-canadian_1.58.0.bb create mode 100644 meta/recipes-devtools/rust/rust-cross-canadian_1.58.1.bb delete mode 100644 meta/recipes-devtools/rust/rust-cross_1.58.0.bb create mode 100644 meta/recipes-devtools/rust/rust-cross_1.58.1.bb delete mode 100644 meta/recipes-devtools/rust/rust-llvm_1.58.0.bb create mode 100644 meta/recipes-devtools/rust/rust-llvm_1.58.1.bb delete mode 100644 meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.0.bb create mode 100644 meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.1.bb delete mode 100644 meta/recipes-devtools/rust/rust_1.58.0.bb create mode 100644 meta/recipes-devtools/rust/rust_1.58.1.bb (limited to 'meta/recipes-devtools/rust') diff --git a/meta/recipes-devtools/rust/libstd-rs_1.58.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.58.0.bb deleted file mode 100644 index 141fea1454..0000000000 --- a/meta/recipes-devtools/rust/libstd-rs_1.58.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require rust-source.inc -require libstd-rs.inc - -SRC_URI += " \ - file://0001-Add-base-definitions-for-riscv64-musl.patch;patchdir=../../ \ - file://0002-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set.patch;patchdir=../../ \ - file://0003-FIXUP-Correct-definitions-to-match-musl.patch;patchdir=../../ \ - file://0004-Update-checksums-for-modified-files-for-rust.patch;patchdir=../../ \ - " - -# libstd moved from src/libstd to library/std in 1.47+ -S = "${RUSTSRC}/library/std" diff --git a/meta/recipes-devtools/rust/libstd-rs_1.58.1.bb b/meta/recipes-devtools/rust/libstd-rs_1.58.1.bb new file mode 100644 index 0000000000..141fea1454 --- /dev/null +++ b/meta/recipes-devtools/rust/libstd-rs_1.58.1.bb @@ -0,0 +1,12 @@ +require rust-source.inc +require libstd-rs.inc + +SRC_URI += " \ + file://0001-Add-base-definitions-for-riscv64-musl.patch;patchdir=../../ \ + file://0002-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set.patch;patchdir=../../ \ + file://0003-FIXUP-Correct-definitions-to-match-musl.patch;patchdir=../../ \ + file://0004-Update-checksums-for-modified-files-for-rust.patch;patchdir=../../ \ + " + +# libstd moved from src/libstd to library/std in 1.47+ +S = "${RUSTSRC}/library/std" diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.58.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.58.0.bb deleted file mode 100644 index 766912c019..0000000000 --- a/meta/recipes-devtools/rust/rust-cross-canadian_1.58.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require rust-cross-canadian.inc -require rust-source.inc -require rust-snapshot.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" - diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.58.1.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.58.1.bb new file mode 100644 index 0000000000..766912c019 --- /dev/null +++ b/meta/recipes-devtools/rust/rust-cross-canadian_1.58.1.bb @@ -0,0 +1,6 @@ +require rust-cross-canadian.inc +require rust-source.inc +require rust-snapshot.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" + diff --git a/meta/recipes-devtools/rust/rust-cross_1.58.0.bb b/meta/recipes-devtools/rust/rust-cross_1.58.0.bb deleted file mode 100644 index 3179d395d2..0000000000 --- a/meta/recipes-devtools/rust/rust-cross_1.58.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require rust-cross.inc -require rust-source.inc diff --git a/meta/recipes-devtools/rust/rust-cross_1.58.1.bb b/meta/recipes-devtools/rust/rust-cross_1.58.1.bb new file mode 100644 index 0000000000..3179d395d2 --- /dev/null +++ b/meta/recipes-devtools/rust/rust-cross_1.58.1.bb @@ -0,0 +1,2 @@ +require rust-cross.inc +require rust-source.inc diff --git a/meta/recipes-devtools/rust/rust-llvm_1.58.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.58.0.bb deleted file mode 100644 index 222c20ad3c..0000000000 --- a/meta/recipes-devtools/rust/rust-llvm_1.58.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -# check src/llvm-project/llvm/CMakeLists.txt for llvm version in use -# -LLVM_RELEASE = "13.0.0" -require rust-source.inc -require rust-llvm.inc diff --git a/meta/recipes-devtools/rust/rust-llvm_1.58.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.58.1.bb new file mode 100644 index 0000000000..5b94e22f7b --- /dev/null +++ b/meta/recipes-devtools/rust/rust-llvm_1.58.1.bb @@ -0,0 +1,6 @@ +# check src/llvm-project/llvm/CMakeLists.txt for llvm version in use +# +LLVM_RELEASE = "13.0.0" +require rust-source.inc +require rust-llvm.inc + diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 63ba02b299..92b1535130 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -1,5 +1,5 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust" -SRC_URI[rust.sha256sum] = "37dce222b82a438e550ccd5e45ca9bad1c57aa7acc7adfec6a897c4ff94b6485" +SRC_URI[rust.sha256sum] = "2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469" RUSTSRC = "${WORKDIR}/rustc-${PV}-src" diff --git a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.0.bb b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.0.bb deleted file mode 100644 index 2d809d68f5..0000000000 --- a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require rust-tools-cross-canadian.inc -require rust-source.inc -require rust-snapshot.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" - diff --git a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.1.bb b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.1.bb new file mode 100644 index 0000000000..2d809d68f5 --- /dev/null +++ b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.58.1.bb @@ -0,0 +1,6 @@ +require rust-tools-cross-canadian.inc +require rust-source.inc +require rust-snapshot.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" + diff --git a/meta/recipes-devtools/rust/rust_1.58.0.bb b/meta/recipes-devtools/rust/rust_1.58.0.bb deleted file mode 100644 index b505ad46ca..0000000000 --- a/meta/recipes-devtools/rust/rust_1.58.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -require rust-target.inc -require rust-source.inc -require rust-snapshot.inc - -INSANE_SKIP:${PN}:class-native = "already-stripped" - -do_compile () { - rust_runx build --stage 2 -} - -rust_do_install() { - rust_runx install -} - -python () { - pn = d.getVar('PN') - - if not pn.endswith("-native"): - raise bb.parse.SkipRecipe("Rust recipe doesn't work for target builds at this time. Fixes welcome.") -} - diff --git a/meta/recipes-devtools/rust/rust_1.58.1.bb b/meta/recipes-devtools/rust/rust_1.58.1.bb new file mode 100644 index 0000000000..b505ad46ca --- /dev/null +++ b/meta/recipes-devtools/rust/rust_1.58.1.bb @@ -0,0 +1,21 @@ +require rust-target.inc +require rust-source.inc +require rust-snapshot.inc + +INSANE_SKIP:${PN}:class-native = "already-stripped" + +do_compile () { + rust_runx build --stage 2 +} + +rust_do_install() { + rust_runx install +} + +python () { + pn = d.getVar('PN') + + if not pn.endswith("-native"): + raise bb.parse.SkipRecipe("Rust recipe doesn't work for target builds at this time. Fixes welcome.") +} + -- cgit 1.2.3-korg