From 95832841bf1d16a939df62670dadeff50cd3c1ed Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 11 Aug 2022 21:58:01 +0200 Subject: rust: update 1.62.0 -> 1.62.1 (From OE-Core rev: 6baa224158f40b9754c3f10e11966d02e1337ae7) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/cargo/cargo_1.62.0.bb | 5 -- meta/recipes-devtools/cargo/cargo_1.62.1.bb | 5 ++ meta/recipes-devtools/rust/libstd-rs_1.62.0.bb | 7 -- meta/recipes-devtools/rust/libstd-rs_1.62.1.bb | 7 ++ .../rust/rust-cross-canadian_1.62.0.bb | 2 - .../rust/rust-cross-canadian_1.62.1.bb | 2 + meta/recipes-devtools/rust/rust-llvm_1.62.0.bb | 6 -- meta/recipes-devtools/rust/rust-llvm_1.62.1.bb | 6 ++ meta/recipes-devtools/rust/rust-source.inc | 2 +- meta/recipes-devtools/rust/rust_1.62.0.bb | 82 ---------------------- meta/recipes-devtools/rust/rust_1.62.1.bb | 82 ++++++++++++++++++++++ 11 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 meta/recipes-devtools/cargo/cargo_1.62.0.bb create mode 100644 meta/recipes-devtools/cargo/cargo_1.62.1.bb delete mode 100644 meta/recipes-devtools/rust/libstd-rs_1.62.0.bb create mode 100644 meta/recipes-devtools/rust/libstd-rs_1.62.1.bb delete mode 100644 meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb create mode 100644 meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb delete mode 100644 meta/recipes-devtools/rust/rust-llvm_1.62.0.bb create mode 100644 meta/recipes-devtools/rust/rust-llvm_1.62.1.bb delete mode 100644 meta/recipes-devtools/rust/rust_1.62.0.bb create mode 100644 meta/recipes-devtools/rust/rust_1.62.1.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/cargo/cargo_1.62.0.bb b/meta/recipes-devtools/cargo/cargo_1.62.0.bb deleted file mode 100644 index 5c8527708c..0000000000 --- a/meta/recipes-devtools/cargo/cargo_1.62.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-devtools/rust/rust-source.inc -require recipes-devtools/rust/rust-snapshot.inc -require cargo.inc -BBCLASSEXTEND = "native nativesdk" -RUSTLIB_DEP:class-nativesdk = "" \ No newline at end of file diff --git a/meta/recipes-devtools/cargo/cargo_1.62.1.bb b/meta/recipes-devtools/cargo/cargo_1.62.1.bb new file mode 100644 index 0000000000..5c8527708c --- /dev/null +++ b/meta/recipes-devtools/cargo/cargo_1.62.1.bb @@ -0,0 +1,5 @@ +require recipes-devtools/rust/rust-source.inc +require recipes-devtools/rust/rust-snapshot.inc +require cargo.inc +BBCLASSEXTEND = "native nativesdk" +RUSTLIB_DEP:class-nativesdk = "" \ No newline at end of file diff --git a/meta/recipes-devtools/rust/libstd-rs_1.62.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.62.0.bb deleted file mode 100644 index eec0245ae1..0000000000 --- a/meta/recipes-devtools/rust/libstd-rs_1.62.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require rust-source.inc -require libstd-rs.inc - -# libstd moved from src/libstd to library/std in 1.47+ -S = "${RUSTSRC}/library/std" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/rust/libstd-rs_1.62.1.bb b/meta/recipes-devtools/rust/libstd-rs_1.62.1.bb new file mode 100644 index 0000000000..eec0245ae1 --- /dev/null +++ b/meta/recipes-devtools/rust/libstd-rs_1.62.1.bb @@ -0,0 +1,7 @@ +require rust-source.inc +require libstd-rs.inc + +# libstd moved from src/libstd to library/std in 1.47+ +S = "${RUSTSRC}/library/std" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb deleted file mode 100644 index 55865238ab..0000000000 --- a/meta/recipes-devtools/rust/rust-cross-canadian_1.62.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit cross-canadian -require rust-cross-canadian.inc \ No newline at end of file diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb new file mode 100644 index 0000000000..55865238ab --- /dev/null +++ b/meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb @@ -0,0 +1,2 @@ +inherit cross-canadian +require rust-cross-canadian.inc \ No newline at end of file diff --git a/meta/recipes-devtools/rust/rust-llvm_1.62.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.62.0.bb deleted file mode 100644 index 5b94e22f7b..0000000000 --- a/meta/recipes-devtools/rust/rust-llvm_1.62.0.bb +++ /dev/null @@ -1,6 +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.62.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.62.1.bb new file mode 100644 index 0000000000..5b94e22f7b --- /dev/null +++ b/meta/recipes-devtools/rust/rust-llvm_1.62.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 b814574e55..dbcef2cbc2 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] = "6c00ef115c894c2645e60b5049a4f5dacf1dc0c993f3074f7ae4fdf4c755dd5e" +SRC_URI[rust.sha256sum] = "02066a93c2f6596cc046a897d5716c86e3607c1cd0f54db9a867ae8c8265072e" SRC_URI:append:class-target:pn-rust = " file://hardcodepaths.patch" SRC_URI:append:class-nativesdk:pn-nativesdk-rust = " file://hardcodepaths.patch" diff --git a/meta/recipes-devtools/rust/rust_1.62.0.bb b/meta/recipes-devtools/rust/rust_1.62.0.bb deleted file mode 100644 index 81923c3331..0000000000 --- a/meta/recipes-devtools/rust/rust_1.62.0.bb +++ /dev/null @@ -1,82 +0,0 @@ -require rust-target.inc -require rust-source.inc -require rust-snapshot.inc - -INSANE_SKIP:${PN}:class-native = "already-stripped" -FILES:${PN} += "${libdir}/rustlib" -FILES:${PN} += "${libdir}/*.so" -FILES:${PN}-dev = "" - -do_compile () { - rust_runx build --stage 2 -} - -do_compile:append:class-target () { - rust_runx build --stage 2 src/tools/clippy - rust_runx build --stage 2 src/tools/rustfmt -} - -do_compile:append:class-nativesdk () { - rust_runx build --stage 2 src/tools/clippy - rust_runx build --stage 2 src/tools/rustfmt -} - -ALLOW_EMPTY:${PN} = "1" - -PACKAGES =+ "${PN}-tools-clippy ${PN}-tools-rustfmt" -FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver" -FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt" -RDEPENDS:${PN}-tools-clippy = "${PN}" -RDEPENDS:${PN}-tools-rustfmt = "${PN}" - -SUMMARY:${PN}-tools-clippy = "A collection of lints to catch common mistakes and improve your Rust code" -SUMMARY:${PN}-tools-rustfmt = "A tool for formatting Rust code according to style guidelines" - -rust_do_install() { - rust_runx install -} - -rust_do_install:class-nativesdk() { - export PSEUDO_UNLOAD=1 - rust_runx install - unset PSEUDO_UNLOAD - - install -d ${D}${bindir} - for i in cargo-clippy clippy-driver rustfmt; do - cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir} - chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i - done - - chown root:root ${D}/ -R - rm ${D}${libdir}/rustlib/uninstall.sh - rm ${D}${libdir}/rustlib/install.log - rm ${D}${libdir}/rustlib/manifest* -} - -rust_do_install:class-target() { - export PSEUDO_UNLOAD=1 - rust_runx install - unset PSEUDO_UNLOAD - - install -d ${D}${bindir} - for i in cargo-clippy clippy-driver rustfmt; do - cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir} - chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i - done - - chown root:root ${D}/ -R - rm ${D}${libdir}/rustlib/uninstall.sh - rm ${D}${libdir}/rustlib/install.log - rm ${D}${libdir}/rustlib/manifest* -} - -# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch -# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'" -# when building MACHINE=qemux86 for musl -WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" - -RUSTLIB_DEP:class-nativesdk = "" - -# musl builds include libunwind.a -INSANE_SKIP:${PN} = "staticdev" - diff --git a/meta/recipes-devtools/rust/rust_1.62.1.bb b/meta/recipes-devtools/rust/rust_1.62.1.bb new file mode 100644 index 0000000000..81923c3331 --- /dev/null +++ b/meta/recipes-devtools/rust/rust_1.62.1.bb @@ -0,0 +1,82 @@ +require rust-target.inc +require rust-source.inc +require rust-snapshot.inc + +INSANE_SKIP:${PN}:class-native = "already-stripped" +FILES:${PN} += "${libdir}/rustlib" +FILES:${PN} += "${libdir}/*.so" +FILES:${PN}-dev = "" + +do_compile () { + rust_runx build --stage 2 +} + +do_compile:append:class-target () { + rust_runx build --stage 2 src/tools/clippy + rust_runx build --stage 2 src/tools/rustfmt +} + +do_compile:append:class-nativesdk () { + rust_runx build --stage 2 src/tools/clippy + rust_runx build --stage 2 src/tools/rustfmt +} + +ALLOW_EMPTY:${PN} = "1" + +PACKAGES =+ "${PN}-tools-clippy ${PN}-tools-rustfmt" +FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver" +FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt" +RDEPENDS:${PN}-tools-clippy = "${PN}" +RDEPENDS:${PN}-tools-rustfmt = "${PN}" + +SUMMARY:${PN}-tools-clippy = "A collection of lints to catch common mistakes and improve your Rust code" +SUMMARY:${PN}-tools-rustfmt = "A tool for formatting Rust code according to style guidelines" + +rust_do_install() { + rust_runx install +} + +rust_do_install:class-nativesdk() { + export PSEUDO_UNLOAD=1 + rust_runx install + unset PSEUDO_UNLOAD + + install -d ${D}${bindir} + for i in cargo-clippy clippy-driver rustfmt; do + cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir} + chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i + done + + chown root:root ${D}/ -R + rm ${D}${libdir}/rustlib/uninstall.sh + rm ${D}${libdir}/rustlib/install.log + rm ${D}${libdir}/rustlib/manifest* +} + +rust_do_install:class-target() { + export PSEUDO_UNLOAD=1 + rust_runx install + unset PSEUDO_UNLOAD + + install -d ${D}${bindir} + for i in cargo-clippy clippy-driver rustfmt; do + cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir} + chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i + done + + chown root:root ${D}/ -R + rm ${D}${libdir}/rustlib/uninstall.sh + rm ${D}${libdir}/rustlib/install.log + rm ${D}${libdir}/rustlib/manifest* +} + +# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'" +# when building MACHINE=qemux86 for musl +WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" + +RUSTLIB_DEP:class-nativesdk = "" + +# musl builds include libunwind.a +INSANE_SKIP:${PN} = "staticdev" + -- cgit v1.2.3-54-g00ecf