[v5,09/12] cargo: Include crossbeam-utils patch

Message ID	20221228152334.25449-10-alex.kiernan@gmail.com
State	Accepted, archived
Commit	39402790724014a39b265ee1978396a0514fdc98
Headers	show Return-Path: <alex.kiernan@gmail.com> ip: 209.85.221.46, mailfrom: alex.kiernan@gmail.com) From: Alex Kiernan <alex.kiernan@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan <alex.kiernan@gmail.com> Subject: [OE-Core][PATCH v5 09/12] cargo: Include crossbeam-utils patch Date: Wed, 28 Dec 2022 15:23:31 +0000 Message-Id: <20221228152334.25449-10-alex.kiernan@gmail.com> In-Reply-To: <20221228152334.25449-1-alex.kiernan@gmail.com> References: <20221228152334.25449-1-alex.kiernan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Add rust runtime tests \| expand [v5,00/12] Add rust runtime tests [v5,01/12] rust-llvm: Merge .inc into .bb [v5,02/12] rust-llvm: Update LLVM_VERSION to match embedded version [v5,03/12] packagegroup-rust-sdk-target: Add Rust SDK target packagegroup [v5,04/12] packagegroup-core-sdk: Add SDK toolchain language selection support [v5,05/12] rust: Merge .inc into .bb [v5,06/12] rust: Move musl-x86 fix for `__stack_chk_fail_local` to rust-source [v5,07/12] cargo: Merge .inc into .bb [v5,08/12] cargo: Extend DEBUG_PREFIX_MAP to cover vendor [v5,09/12] cargo: Include crossbeam-utils patch [v5,10/12] cargo: Drop exclude from world [v5,11/12] packagegroup-rust-sdk-target: Add cargo [v5,12/12] oeqa/runtime/rust: Add cargo test

Message ID

20221228152334.25449-10-alex.kiernan@gmail.com

State

Accepted, archived

Commit

39402790724014a39b265ee1978396a0514fdc98

Headers

From: Alex Kiernan <alex.kiernan@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alex Kiernan <alex.kiernan@gmail.com>
Subject: [OE-Core][PATCH v5 09/12] cargo: Include crossbeam-utils patch
Date: Wed, 28 Dec 2022 15:23:31 +0000
Message-Id: <20221228152334.25449-10-alex.kiernan@gmail.com>
In-Reply-To: <20221228152334.25449-1-alex.kiernan@gmail.com>
References: <20221228152334.25449-1-alex.kiernan@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

Add rust runtime tests | expand

Commit Message

Alex Kiernan Dec. 28, 2022, 3:23 p.m. UTC

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 <alex.kiernan@gmail.com>
---

Changes in v5:
- Switch from cargo patching to bitbake patching (https://github.com/rust-lang/rust/issues/98185)

Changes in v4:
- Add crossbeam atomics fixes for ppc/mips

 meta/recipes-devtools/{cargo => rust}/cargo_1.66.0.bb    | 9 +++++++--
 .../rust/{rust => files}/crossbeam_atomic.patch          | 0
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/{cargo => rust}/cargo_1.66.0.bb (93%)
 rename meta/recipes-devtools/rust/{rust => files}/crossbeam_atomic.patch (100%)

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 fe8049b68c9b..f00c67bef5e5 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

[v5,09/12] cargo: Include crossbeam-utils patch

Commit Message

Patch