forked from webosose/meta-webosose
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
webos: solana: Fix build with rust-1.72 and newer
:Release Notes: After rust upgrade in oe-core from 1.71.1 to 1.74.1 in: https://git.openembedded.org/openembedded-core/commit/?id=30637cdeb31fae02544fdc643a455d0ebb126ee6 and following commits, solana was failing to build. :Detailed Notes: Backport a fix from v1.17.0: solana-labs/solana#32961 we need only this part: solana-labs/solana@9e703f8#diff-2830a98fa15197faaaf1226883e9011c9302fedb10c7926077b17c07fa320c57 for other fixes we should just upgrade solana in OSE to latest. :Testing Performed: Only build tested. :QA Notes: No change to image. :Issues Addressed: [WRP-29491] Create GPVB with Yocto 5.0 Scarthgap Change-Id: I4b926d3da35a3f2341593f19bb1332b233fc2c2a
- Loading branch information
1 parent
66ceed9
commit 0a920df
Showing
2 changed files
with
48 additions
and
1 deletion.
There are no files selected for viewing
45 changes: 45 additions & 0 deletions
45
...rs/clang-layer/solana/files/0001-account_info.rs-Fix-build-with-rust-1.72-and-newer.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
From f1139989b39b32476be655a451b950cab416c09a Mon Sep 17 00:00:00 2001 | ||
From: Martin Jansa <[email protected]> | ||
Date: Thu, 4 Jan 2024 14:02:03 +0100 | ||
Subject: [PATCH] account_info.rs: Fix build with rust-1.72 and newer | ||
|
||
:Release Notes: | ||
After rust upgrade in oe-core from 1.71.1 to 1.74.1 in: | ||
https://git.openembedded.org/openembedded-core/commit/?id=30637cdeb31fae02544fdc643a455d0ebb126ee6 | ||
and following commits, solana was failing to build. | ||
|
||
:Detailed Notes: | ||
Backport a fix from v1.17.0: | ||
https://github.com/solana-labs/solana/pull/32961 | ||
|
||
we need only this part: | ||
https://github.com/solana-labs/solana/commit/9e703f85de4184f577f22a1c72a0d33612f2feb1#diff-2830a98fa15197faaaf1226883e9011c9302fedb10c7926077b17c07fa320c57 | ||
|
||
for other fixes we should just upgrade solana in OSE to latest. | ||
|
||
:Testing Performed: | ||
Only build tested. | ||
|
||
:QA Notes: | ||
No change to image. | ||
|
||
:Issues Addressed: | ||
[WRP-29491] Create GPVB with Yocto 5.0 Scarthgap | ||
--- | ||
Upstream-Status: Backport [v1.17.0: https://github.com/solana-labs/solana/pull/32961] | ||
|
||
sdk/program/src/account_info.rs | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/sdk/program/src/account_info.rs b/sdk/program/src/account_info.rs | ||
index 3652e2251e..006390473b 100644 | ||
--- a/sdk/program/src/account_info.rs | ||
+++ b/sdk/program/src/account_info.rs | ||
@@ -181,6 +181,7 @@ impl<'a> AccountInfo<'a> { | ||
Ok(()) | ||
} | ||
|
||
+ #[rustversion::attr(since(1.72), allow(invalid_reference_casting))] | ||
pub fn assign(&self, new_owner: &Pubkey) { | ||
// Set the non-mut owner field | ||
unsafe { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters