From cc9244ca70957cf1ed11ee987fc6496e3ea92567 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sat, 7 Jan 2023 09:48:39 +0000 Subject: [PATCH] rust: Merge all rustc-source patches into rust-source.inc With the dim-sum approach to patching we had the same patch applied in many places, but not all, so that there were no guarantees that we were actually building agaginst the same thing in all recipes. (From OE-Core rev: 550c273f38d8e6d2d431908023e213c6b018d7ed) Signed-off-by: Alex Kiernan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/cargo_1.66.0.bb | 8 ------- .../rust/{rust => files}/hardcodepaths.patch | 0 .../rust/{rust => files}/zlib-off64_t.patch | 0 meta/recipes-devtools/rust/rust-source.inc | 24 +++++++++---------- meta/recipes-devtools/rust/rust_1.66.0.bb | 3 --- 5 files changed, 11 insertions(+), 24 deletions(-) rename meta/recipes-devtools/rust/{rust => files}/hardcodepaths.patch (100%) rename meta/recipes-devtools/rust/{rust => files}/zlib-off64_t.patch (100%) diff --git a/meta/recipes-devtools/rust/cargo_1.66.0.bb b/meta/recipes-devtools/rust/cargo_1.66.0.bb index f45f8f1e12..2b2394e898 100644 --- a/meta/recipes-devtools/rust/cargo_1.66.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.66.0.bb @@ -14,14 +14,6 @@ LIC_FILES_CHKSUM = " \ require rust-source.inc require rust-snapshot.inc -SRC_URI:append:class-target = "\ - file://crossbeam_atomic.patch;patchdir=${RUSTSRC} \ - file://getrandom-open64.patch;patchdir=${RUSTSRC} \ -" - -# Used by crossbeam_atomic.patch -export TARGET_VENDOR - S = "${RUSTSRC}/src/tools/cargo" CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" diff --git a/meta/recipes-devtools/rust/rust/hardcodepaths.patch b/meta/recipes-devtools/rust/files/hardcodepaths.patch similarity index 100% rename from meta/recipes-devtools/rust/rust/hardcodepaths.patch rename to meta/recipes-devtools/rust/files/hardcodepaths.patch diff --git a/meta/recipes-devtools/rust/rust/zlib-off64_t.patch b/meta/recipes-devtools/rust/files/zlib-off64_t.patch similarity index 100% rename from meta/recipes-devtools/rust/rust/zlib-off64_t.patch rename to meta/recipes-devtools/rust/files/zlib-off64_t.patch diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index bfb625fb36..6f1df4561b 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -1,21 +1,19 @@ RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}" -SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust" + +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} \ +" SRC_URI[rust.sha256sum] = "0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c" -SRC_URI:append:class-target:pn-libstd-rs = "\ - file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=../.. \ -" - -SRC_URI:append:class-target:pn-rust = " \ - file://getrandom-open64.patch \ - file://0001-Do-not-use-LFS64-on-linux-with-musl.patch \ - file://zlib-off64_t.patch \ - file://hardcodepaths.patch \ - file://crossbeam_atomic.patch" -SRC_URI:append:class-nativesdk:pn-nativesdk-rust = " file://hardcodepaths.patch" - RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" +# Used by crossbeam_atomic.patch +export TARGET_VENDOR + UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" UPSTREAM_CHECK_REGEX = "rustc-(?P\d+(\.\d+)+)-src" diff --git a/meta/recipes-devtools/rust/rust_1.66.0.bb b/meta/recipes-devtools/rust/rust_1.66.0.bb index f1ec769aef..eba933dded 100644 --- a/meta/recipes-devtools/rust/rust_1.66.0.bb +++ b/meta/recipes-devtools/rust/rust_1.66.0.bb @@ -218,9 +218,6 @@ FILES:${PN} += "${libdir}/rustlib" FILES:${PN} += "${libdir}/*.so" FILES:${PN}-dev = "" -# Used by crossbeam_atomic.patch -export TARGET_VENDOR - do_compile () { rust_runx build --stage 2 }