From: Alex Kiernan Date: Wed, 28 Dec 2022 15:23:31 +0000 (+0000) Subject: cargo: Include crossbeam-utils patch X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2166 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39402790724014a39b265ee1978396a0514fdc98;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cargo: Include crossbeam-utils patch We need patched crossbeam-utils in cargo as well as rust, move cargo alongside rust so they can both use the same patch. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/cargo/cargo_1.66.0.bb b/meta/recipes-devtools/rust/cargo_1.66.0.bb similarity index 93% rename from meta/recipes-devtools/cargo/cargo_1.66.0.bb rename to meta/recipes-devtools/rust/cargo_1.66.0.bb index fe8049b68c9..f00c67bef5e 100644 --- a/meta/recipes-devtools/cargo/cargo_1.66.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.66.0.bb @@ -11,8 +11,13 @@ LIC_FILES_CHKSUM = " \ file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \ " -require recipes-devtools/rust/rust-source.inc -require recipes-devtools/rust/rust-snapshot.inc +require rust-source.inc +require rust-snapshot.inc + +SRC_URI:append:class-target = " file://crossbeam_atomic.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/crossbeam_atomic.patch b/meta/recipes-devtools/rust/files/crossbeam_atomic.patch similarity index 100% rename from meta/recipes-devtools/rust/rust/crossbeam_atomic.patch rename to meta/recipes-devtools/rust/files/crossbeam_atomic.patch