rust/comprehensive-rust
1
0
Fork 0
mirror of https://github.com/google/comprehensive-rust.git synced 2025-04-25 16:54:32 +02:00
Code Issues Releases Activity

Bring Chromium patching instructions up to date. (#1508)

Browse Source 
Patching is now automatic.
This commit is contained in:
Adrian Taylor 2023-11-29 14:41:52 +00:00 committed by GitHub
parent 5cec89045b
commit ea204774b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/chromium/adding-third-party-crates/downloading-crates.md
View File

@ -21,10 +21,9 @@ This `vendor` command may download:
* New versions of other crates, as required by `cargo` to resolve
the complete set of crates required by Chromium.
If a crate in `//third_party/rust/chromium_crates_io/patches` was updated as
part of vendoring, then reapply patches to it by running
`cd third_party/rust/chromium_crates_io; ./apply_patches.sh`.
Chromium maintains patches for some crates, kept in
`//third_party/rust/chromium_crates_io/patches`. These will be reapplied
automatically, but if patching fails you may need to take manual action.
[0]: ../cargo.md

18
src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md
View File

@ -1,7 +1,7 @@
# Build scripts which build C++ or take arbitrary actions
Some crates use the [`cc`][2] crate to build and link C/C++ libraries.
Other crates parse C/C++ using [`bindgen`][3] within their build scripts.
Some crates use the [`cc`][1] crate to build and link C/C++ libraries.
Other crates parse C/C++ using [`bindgen`][2] within their build scripts.
These actions can't be supported in a Chromium context --- our gn, ninja
and LLVM build system is very specific in expressing relationships between
build actions.
@ -12,13 +12,9 @@ So, your options are:
* Apply a patch to the crate.
Patches should be kept in `third_party/rust/chromium_crates_io/patches/<crate>` -
see for example the [patches against the cxx crate][4]. There is currently
no automation --- [simply create and apply patches manually][5] to remove the
problematic actions from the build script.
see for example the [patches against the cxx crate][3] - and will be applied
automatically by `gnrt` each time it upgrades the crate.
If your patches modify the `Cargo.toml` file, rerun `gnrt gen`.
[2]: https://crates.io/crates/cc
[3]: https://crates.io/crates/bindgen
[4]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/rust/chromium_crates_io/patches/cxx/
[5]: https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/rust.md#patching-third_party-crates
[1]: https://crates.io/crates/cc
[2]: https://crates.io/crates/bindgen
[3]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/rust/chromium_crates_io/patches/cxx/