From 9fffdb275f4cc6449b31e0873c14c8a4ceabe2d3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 6 Dec 2016 15:15:08 -0700 Subject: [PATCH] Remove replacement for libc --- drivers/e1000d/Cargo.toml | 3 --- drivers/rtl8168d/Cargo.toml | 3 --- libstd/Cargo.toml | 4 ---- libstd/alloc_system/Cargo.toml | 3 --- programs/extrautils | 2 +- programs/netutils | 2 +- programs/orbutils | 2 +- programs/pkgutils | 2 +- programs/userutils | 2 +- schemes/ethernetd/Cargo.toml | 3 --- schemes/ipd/Cargo.toml | 3 --- schemes/tcpd/Cargo.toml | 3 --- schemes/udpd/Cargo.toml | 3 --- 13 files changed, 5 insertions(+), 30 deletions(-) diff --git a/drivers/e1000d/Cargo.toml b/drivers/e1000d/Cargo.toml index 1c8431a8..ec8c45e1 100644 --- a/drivers/e1000d/Cargo.toml +++ b/drivers/e1000d/Cargo.toml @@ -9,6 +9,3 @@ event = { path = "../../crates/event/" } io = { path = "../../crates/io/" } netutils = { path = "../../programs/netutils/" } redox_syscall = { path = "../../syscall/" } - -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/drivers/rtl8168d/Cargo.toml b/drivers/rtl8168d/Cargo.toml index 2672a5c2..e72a1304 100644 --- a/drivers/rtl8168d/Cargo.toml +++ b/drivers/rtl8168d/Cargo.toml @@ -9,6 +9,3 @@ event = { path = "../../crates/event/" } io = { path = "../../crates/io/" } netutils = { path = "../../programs/netutils/" } redox_syscall = { path = "../../syscall/" } - -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/libstd/Cargo.toml b/libstd/Cargo.toml index 38264dc7..1b7f3ea5 100644 --- a/libstd/Cargo.toml +++ b/libstd/Cargo.toml @@ -15,9 +15,5 @@ panic_abort = { path = "panic_abort" } libc = { path = "libc" } unwind = { path = "unwind" } -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } - [target.'cfg(target_os = "redox")'.dependencies] redox_syscall = { git = "https://github.com/redox-os/syscall.git" } - diff --git a/libstd/alloc_system/Cargo.toml b/libstd/alloc_system/Cargo.toml index dcb5bfb0..ff91e533 100644 --- a/libstd/alloc_system/Cargo.toml +++ b/libstd/alloc_system/Cargo.toml @@ -8,6 +8,3 @@ git = "https://github.com/redox-os/ralloc.git" branch = "new_kernel" default-features = false features = ["allocator"] - -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/programs/extrautils b/programs/extrautils index 63f27dcc..b2a83ff0 160000 --- a/programs/extrautils +++ b/programs/extrautils @@ -1 +1 @@ -Subproject commit 63f27dccc12184a4eb73efa0a065fea65650c664 +Subproject commit b2a83ff0ddbbb5e828acc56f84c37f35262ea759 diff --git a/programs/netutils b/programs/netutils index edf04d99..c4d448e0 160000 --- a/programs/netutils +++ b/programs/netutils @@ -1 +1 @@ -Subproject commit edf04d99223dd3850ffd6c91d34143e0bfe086e6 +Subproject commit c4d448e0df0b0ee0d85e92a23ec8de44c952e262 diff --git a/programs/orbutils b/programs/orbutils index 0757b263..33576b7a 160000 --- a/programs/orbutils +++ b/programs/orbutils @@ -1 +1 @@ -Subproject commit 0757b2637e40b477ce2d5a75df321d381ba22870 +Subproject commit 33576b7a6c67c4a822bc9ec6386661d24c002014 diff --git a/programs/pkgutils b/programs/pkgutils index b9db33d8..a196bd36 160000 --- a/programs/pkgutils +++ b/programs/pkgutils @@ -1 +1 @@ -Subproject commit b9db33d81aea2d40cc88432926558d146363b4a1 +Subproject commit a196bd36ff9f95025b95f5e68c4671cc64c14b09 diff --git a/programs/userutils b/programs/userutils index 56da6a40..80379e0e 160000 --- a/programs/userutils +++ b/programs/userutils @@ -1 +1 @@ -Subproject commit 56da6a40b06cded7358c0fa7d93b7c4093c4b78d +Subproject commit 80379e0eaee5f15910dfb2f959c60cb70d321270 diff --git a/schemes/ethernetd/Cargo.toml b/schemes/ethernetd/Cargo.toml index ad425aeb..6e10ca0b 100644 --- a/schemes/ethernetd/Cargo.toml +++ b/schemes/ethernetd/Cargo.toml @@ -6,6 +6,3 @@ version = "0.1.0" event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } redox_syscall = { path = "../../syscall/" } - -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/schemes/ipd/Cargo.toml b/schemes/ipd/Cargo.toml index f1efafa4..23d2f3d7 100644 --- a/schemes/ipd/Cargo.toml +++ b/schemes/ipd/Cargo.toml @@ -6,6 +6,3 @@ version = "0.1.0" event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } redox_syscall = { path = "../../syscall/" } - -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/schemes/tcpd/Cargo.toml b/schemes/tcpd/Cargo.toml index f4e7c5b7..a9c42020 100644 --- a/schemes/tcpd/Cargo.toml +++ b/schemes/tcpd/Cargo.toml @@ -7,6 +7,3 @@ event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } rand = { git = "https://github.com/rust-lang-nursery/rand.git" } redox_syscall = { path = "../../syscall/" } - -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } diff --git a/schemes/udpd/Cargo.toml b/schemes/udpd/Cargo.toml index 67ef8fca..a62ffb06 100644 --- a/schemes/udpd/Cargo.toml +++ b/schemes/udpd/Cargo.toml @@ -7,6 +7,3 @@ event = { path = "../../crates/event/" } netutils = { path = "../../programs/netutils/" } rand = { git = "https://github.com/rust-lang-nursery/rand.git" } redox_syscall = { path = "../../syscall/" } - -[replace] -"libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" }