diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2023-04-26 16:40:53 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:25 +0100 |
| commit | b17491f7f1087703a2519a9004cb7fbdba6c5fbf (patch) | |
| tree | 904eea95a800ae1de0f18a20dc11a7cdc180d12a /meta/recipes-devtools/rust/files/crossbeam_atomic.patch | |
| parent | 2e84bb1971d1b9511f26d5ff885fdb5f5c09a788 (diff) | |
| download | poky-b17491f7f1087703a2519a9004cb7fbdba6c5fbf.tar.gz | |
rust: Upgrade 1.68.2 -> 1.69.0
Rebase patches, drop crossbeam_atomic is this fully merged upstream.
https://blog.rust-lang.org/2023/04/20/Rust-1.69.0.html
(From OE-Core rev: 39e05f9b0fdc3f76f8b80a12989f78614bc9ea5c)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rust/files/crossbeam_atomic.patch')
| -rw-r--r-- | meta/recipes-devtools/rust/files/crossbeam_atomic.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-devtools/rust/files/crossbeam_atomic.patch b/meta/recipes-devtools/rust/files/crossbeam_atomic.patch deleted file mode 100644 index 0a2910391e..0000000000 --- a/meta/recipes-devtools/rust/files/crossbeam_atomic.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | crossbeam-utils is taking the target triplet and comparing it against a | ||
| 2 | known list of platforms that have issues either with any atomics or with | ||
| 3 | 64 bit atomics. Since OE encodes TARGET_VENDOR into the rust triplet (to | ||
| 4 | differentiate host vs. target) this means that platforms that should match, | ||
| 5 | don't. | ||
| 6 | |||
| 7 | We could make a list of platforms and pass in configuration values but | ||
| 8 | having one list in rust and another in our recipes is likely to cause | ||
| 9 | problems in the future. We do already have this issue in the librsvg recipe. | ||
| 10 | Instead, switch out the value of TARGET_VENDOR for "-unknown" which | ||
| 11 | them makes the list in no_atomics.rs work correctly. | ||
| 12 | |||
| 13 | Someone with more rust knowledge could split up the triplets in no_atmoics.rs | ||
| 14 | and compare against the architecture/processor, or replace -unknown with a glob | ||
| 15 | to create a patch that upstream might accept. | ||
| 16 | |||
| 17 | Upstream-Status: Submitted [https://github.com/crossbeam-rs/crossbeam/pull/922] | ||
| 18 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 19 | |||
| 20 | Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/build.rs | ||
| 21 | =================================================================== | ||
| 22 | --- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.12/build.rs | ||
| 23 | +++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/build.rs | ||
| 24 | @@ -29,7 +29,7 @@ use std::env; | ||
| 25 | include!("no_atomic.rs"); | ||
| 26 | |||
| 27 | fn main() { | ||
| 28 | - let target = match env::var("TARGET") { | ||
| 29 | + let mut target = match env::var("TARGET") { | ||
| 30 | Ok(target) => target, | ||
| 31 | Err(e) => { | ||
| 32 | println!( | ||
| 33 | @@ -40,6 +40,8 @@ fn main() { | ||
| 34 | return; | ||
| 35 | } | ||
| 36 | }; | ||
| 37 | + let vendor = env::var("TARGET_VENDOR").unwrap(); | ||
| 38 | + target = target.replace(&vendor, "-unknown"); | ||
| 39 | |||
| 40 | // Note that this is `no_`*, not `has_*`. This allows treating as the latest | ||
| 41 | // stable rustc is used when the build script doesn't run. This is useful | ||
| 42 | Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json | ||
| 43 | =================================================================== | ||
| 44 | --- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json | ||
| 45 | +++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json | ||
| 46 | @@ -1 +1 @@ | ||
| 47 | -{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"4859f9c926c230023e861bf01c4b225b460035faf8cf6240108530efedbb747f","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"} | ||
| 48 | \ No newline at end of file | ||
| 49 | +{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"108ba75398e3169c35b0e9754782391e4e4a9f9bf0ae2b216b55d836c4ac9ba8","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"} | ||
| 50 | \ No newline at end of file | ||
