From 13f5a76bc15964578bda691a34414f83084716d2 Mon Sep 17 00:00:00 2001 From: Mark Drobnak Date: Mon, 28 Mar 2022 18:38:28 -0700 Subject: [PATCH] Update libc to 0.2.121 (upstream) All of our 3DS changes have been upstreamed. If in the future we need to use the fork again, we can edit the top-level Cargo.toml and adjust the patches (replace upstream with fork). --- Cargo.toml | 5 ++--- ctru-rs/Cargo.toml | 2 +- ctru-sys/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 80b876e..39988bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,8 @@ [workspace] 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/libc'] +libc = "0.2.121" [patch.'https://github.com/Meziu/ctru-rs'] # Make sure all dependencies use the local ctru-sys package diff --git a/ctru-rs/Cargo.toml b/ctru-rs/Cargo.toml index baf2c79..148a76a 100644 --- a/ctru-rs/Cargo.toml +++ b/ctru-rs/Cargo.toml @@ -16,7 +16,7 @@ ctru-sys = { path = "../ctru-sys", version = "0.4" } const-zero = "0.1.0" linker-fix-3ds = { git = "https://github.com/Meziu/rust-linker-fix-3ds.git" } pthread-3ds = { git = "https://github.com/Meziu/pthread-3ds.git" } -libc = "0.2.116" +libc = "0.2.121" bitflags = "1.0.0" widestring = "0.2.2" once_cell = "1.10.0" diff --git a/ctru-sys/Cargo.toml b/ctru-sys/Cargo.toml index 3cde33c..6367b13 100644 --- a/ctru-sys/Cargo.toml +++ b/ctru-sys/Cargo.toml @@ -7,4 +7,4 @@ links = "ctru" edition = "2021" [dependencies] -libc = { version = "0.2.116", default-features = false } +libc = { version = "0.2.121", default-features = false }