From e70fdb52fbc1511b45d111301e2d78d8822a50f3 Mon Sep 17 00:00:00 2001
From: Xavier L'Heureux <xavier.lheureux@icloud.com>
Date: Mon, 22 Jul 2019 14:02:49 -0400
Subject: [PATCH] Use the newer libc + nix proposed patches
---
.cargo/config | 3 ++-
.gitmodules | 8 ++++++++
patches/libc | 1 +
patches/liblibc | 1 -
patches/nix | 1 +
5 files changed, 12 insertions(+), 2 deletions(-)
create mode 160000 patches/libc
delete mode 160000 patches/liblibc
create mode 160000 patches/nix
diff --git a/.cargo/config b/.cargo/config
index fcad4b69c..c6052f61b 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,7 +1,8 @@
paths = [
"patches/atty",
- "patches/liblibc",
+ "patches/libc",
"patches/mio",
+ "patches/nix",
"patches/tokio/tokio",
"patches/tokio/tokio-reactor",
"patches/net2-rs",
diff --git a/.gitmodules b/.gitmodules
index 486723ae8..0835e1f17 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -48,3 +48,11 @@
[submodule "patches/tokio"]
path = patches/tokio
url = https://gitlab.redox-os.org/redox-os/tokio.git
+[submodule "patches/libc"]
+ path = patches/libc
+ url = https://github.com/AdminXVII/libc
+ branch = extra-traits-redox
+[submodule "patches/nix"]
+ path = patches/nix
+ url = https://github.com/AdminXVII/nix
+ branch = add-redox-support
diff --git a/patches/libc b/patches/libc
new file mode 160000
index 000000000..f6c0ead02
--- /dev/null
+++ b/patches/libc
@@ -0,0 +1 @@
+Subproject commit f6c0ead0279077dd9bda305e6c9d3ba3267390b2
diff --git a/patches/liblibc b/patches/liblibc
deleted file mode 160000
index eb75c4891..000000000
--- a/patches/liblibc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eb75c489172e10bfcb57ca679ff337827cf783a9
diff --git a/patches/nix b/patches/nix
new file mode 160000
index 000000000..6fd645694
--- /dev/null
+++ b/patches/nix
@@ -0,0 +1 @@
+Subproject commit 6fd64569452536e9759c45c8f4511e6c983196f3
--
GitLab