Browse Source

Remove duplicate dependencies by patching, and add back links field

We don't want duplicate ctru-sys crates in the dependency graph. Same
for libc. We can patch them here to avoid any issues.

Now that we don't have duplicate ctru-sys crates, we can add back the
links field. This field is important because it warns us when there are
two crates linking to the same library (ex. duplicate ctru-sys crates).
pull/40/head
AzureMarker 3 years ago
parent
commit
82eded005e
No known key found for this signature in database
GPG Key ID: 47A133F3BF9D03D3
  1. 8
      Cargo.toml
  2. 1
      ctru-sys/Cargo.toml

8
Cargo.toml

@ -1,2 +1,10 @@
[workspace] [workspace]
members = ["ctru-rs", "ctru-sys"] members = ["ctru-rs", "ctru-sys"]
[patch.crates-io]
# We have some changes not in the upstream
libc = { git = "https://github.com/Meziu/libc.git" }
[patch.'https://github.com/Meziu/ctru-rs']
# Make sure all dependencies use the local ctru-sys package
ctru-sys = { path = "ctru-sys" }

1
ctru-sys/Cargo.toml

@ -3,6 +3,7 @@ name = "ctru-sys"
version = "0.4.0" version = "0.4.0"
authors = ["Ronald Kinard <furyhunter600@gmail.com>"] authors = ["Ronald Kinard <furyhunter600@gmail.com>"]
license = "https://en.wikipedia.org/wiki/Zlib_License" license = "https://en.wikipedia.org/wiki/Zlib_License"
links = "ctru"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

Loading…
Cancel
Save