diff --git a/dev-lang/rust/patches/cargo-0.19.0.patchset b/dev-lang/rust/patches/cargo-0.19.0.patchset
new file mode 100644
index 000000000..441085785
--- /dev/null
+++ b/dev-lang/rust/patches/cargo-0.19.0.patchset
@@ -0,0 +1,351 @@
+From 154b259a1235f3be3cf8d4d89d45897846820026 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Sun, 8 Oct 2017 08:09:26 +0000
+Subject: [PATCH 1/5] Update dependencies to packages with Haiku support
+
+* num_cpus from 1.3.0 to 1.4.0
+* fs2 from 0.4.1 to 0.4.2
+---
+ Cargo.lock | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 2af99367..d696cf27 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -13,7 +13,7 @@ dependencies = [
+  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fs2 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -23,7 +23,7 @@ dependencies = [
+  "libgit2-sys 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -211,7 +211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "fs2"
+-version = "0.4.1"
++version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -468,7 +468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "num_cpus"
+-version = "1.3.0"
++version = "1.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -833,7 +833,7 @@ dependencies = [
+ "checksum filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922"
+ "checksum flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4e4d0c15ef829cbc1b7cda651746be19cceeb238be7b1049227b14891df9e25"
+ "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
+-"checksum fs2 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34edaee07555859dc13ca387e6ae05686bb4d0364c95d649b6dab959511f4baf"
++"checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
+ "checksum gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)" = "40899336fb50db0c78710f53e87afc54d8c7266fb76262fecc78ca1a7f09deae"
+ "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
+ "checksum git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "046ae03385257040b2a35e56d9669d950dd911ba2bf48202fbef73ee6aab27b2"
+@@ -862,7 +862,7 @@ dependencies = [
+ "checksum num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e"
+ "checksum num-rational 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "c2dc5ea04020a8f18318ae485c751f8cfa1c0e69dcf465c29ddaaa64a313cc44"
+ "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99"
+-"checksum num_cpus 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a18c392466409c50b87369414a2680c93e739aedeb498eb2bff7d7eb569744e2"
++"checksum num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca313f1862c7ec3e0dfe8ace9fa91b1d9cb5c84ace3d00f5ec4216238e93c167"
+ "checksum openssl 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8aa0eb7aad44f0da6f7dda13ddb4559d91a0f40cfab150b1f76ad5b39ec523f"
+ "checksum openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf"
+ "checksum openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "14f5bfd12054d764510b887152d564ba11d99ae24ea7d740781778f646620576"
+-- 
+2.16.2
+
+
+From 755b0c67b94534c936df99ed0b2d9a28ef3d09d3 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Sun, 8 Oct 2017 08:10:10 +0000
+Subject: [PATCH 2/5] Haiku: libc does not define SIGSYS. Use the constant
+ instead.
+
+To be fixed in future versions of liblibc
+---
+ src/cargo/util/errors.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs
+index 94f422f8..1bf0a9d8 100644
+--- a/src/cargo/util/errors.rs
++++ b/src/cargo/util/errors.rs
+@@ -459,7 +459,7 @@ pub fn process_error(msg: &str,
+                 libc::SIGSEGV => ", SIGSEGV: invalid memory reference",
+                 libc::SIGTERM => ", SIGTERM: termination signal",
+                 libc::SIGBUS => ", SIGBUS: access to undefined memory",
+-                libc::SIGSYS => ", SIGSYS: bad system call",
++                25 => ", SIGSYS: bad system call",
+                 libc::SIGTRAP => ", SIGTRAP: trace/breakpoint trap",
+                 _ => "",
+             };
+-- 
+2.16.2
+
+
+From 6520893d37b540e4ced1531c2eabcb51da234ff4 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Sun, 8 Oct 2017 11:30:02 +0000
+Subject: [PATCH 3/5] Haiku: properly process the SYSCONFDIR for Haiku
+ packaging
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 55e9bb0d..ea47e820 100755
+--- a/configure
++++ b/configure
+@@ -379,6 +379,7 @@ CFG_INFODIR=${CFG_INFODIR#${CFG_PREFIX}}
+ CFG_DOCDIR=${CFG_DOCDIR#${CFG_PREFIX}}
+ CFG_MANDIR=${CFG_MANDIR#${CFG_PREFIX}}
+ CFG_LIBDIR=${CFG_LIBDIR#${CFG_PREFIX}}
++CFG_SYSCONFDIR=${CFG_SYSCONFDIR#${CFG_PREFIX}}
+ 
+ # copy host-triples to target-triples so that hosts are a subset of targets
+ V_TEMP=""
+@@ -407,6 +408,7 @@ putvar CFG_DOCDIR
+ putvar CFG_INFODIR
+ putvar CFG_MANDIR
+ putvar CFG_LIBDIR
++putvar CFG_SYSCONFDIR
+ putvar CFG_RUSTC
+ putvar CFG_RUSTDOC
+ putvar CFG_CARGO
+-- 
+2.16.2
+
+
+From 63c5596d0ea8cdfcb5100e5b1a36fbe160988ad8 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Sun, 8 Oct 2017 17:54:43 +0000
+Subject: [PATCH 4/5] Haiku: rename() gives an error when the filenames are the
+ same. Backport of future fix
+
+---
+ src/cargo/ops/cargo_rustc/mod.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
+index b20f5709..ae3af71a 100644
+--- a/src/cargo/ops/cargo_rustc/mod.rs
++++ b/src/cargo/ops/cargo_rustc/mod.rs
+@@ -369,7 +369,7 @@ fn rustc(cx: &mut Context, unit: &Unit, exec: Arc<Executor>) -> CargoResult<Work
+             let src = dst.with_file_name(dst.file_name().unwrap()
+                                             .to_str().unwrap()
+                                             .replace(&real_name, &crate_name));
+-            if src.exists() {
++            if src.exists() && src.file_name() != dst.file_name() {
+                 fs::rename(&src, &dst).chain_error(|| {
+                     internal(format!("could not rename crate {:?}", src))
+                 })?;
+-- 
+2.16.2
+
+
+From 35add04124629d0a357523f781076164180de7d4 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Thu, 10 May 2018 06:39:45 +0000
+Subject: [PATCH 5/5] Haiku: update libgit2-sys to 0.6.18 This includes PR #276
+ for the git2-rs repository. git_libgit2_shutdown is no longer called
+ atexit(). This call created segfaults regularly in cargo.
+
+---
+ Cargo.lock | 49 ++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 34 insertions(+), 15 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index d696cf27..47566652 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -14,13 +14,13 @@ dependencies = [
+  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+  "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libgit2-sys 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libgit2-sys 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -71,6 +71,11 @@ name = "bitflags"
+ version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
++[[package]]
++name = "bitflags"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
+ [[package]]
+ name = "bufstream"
+ version = "0.1.2"
+@@ -84,7 +89,7 @@ dependencies = [
+  "cargo 0.19.0",
+  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -99,6 +104,11 @@ dependencies = [
+  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
++[[package]]
++name = "cc"
++version = "1.0.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
+ [[package]]
+ name = "cfg-if"
+ version = "0.1.0"
+@@ -142,7 +152,7 @@ name = "curl"
+ version = "0.4.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+- "curl-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -151,7 +161,7 @@ dependencies = [
+ 
+ [[package]]
+ name = "curl-sys"
+-version = "0.3.10"
++version = "0.3.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -159,6 +169,7 @@ dependencies = [
+  "libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -235,12 +246,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "git2"
+-version = "0.6.4"
++version = "0.6.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libgit2-sys 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libgit2-sys 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -252,7 +263,7 @@ version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -307,12 +318,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.6.7"
++version = "0.6.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
++ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+- "curl-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libssh2-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -791,6 +802,11 @@ name = "utf8-ranges"
+ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
++[[package]]
++name = "vcpkg"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
+ [[package]]
+ name = "void"
+ version = "1.0.2"
+@@ -820,13 +836,15 @@ dependencies = [
+ "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
+ "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
+ "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
++"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
+ "checksum bufstream 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b48dbe2ff0e98fa2f03377d204a9637d3c9816cd431bfe05a8abbd0ea11d074"
++"checksum cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "0ebb87d1116151416c0cf66a0e3fb6430cccd120fd6300794b4dfaa050ac40ba"
+ "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
+ "checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
+ "checksum cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "d18d68987ed4c516dcc3e7913659bfa4076f5182eea4a7e0038bb060953e76ac"
+ "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+ "checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b"
+-"checksum curl-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d909dc402ae80b6f7b0118c039203436061b9d9a3ca5d2c2546d93e0a61aaa"
++"checksum curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f00c8ba847fb0730c293069b4d1203dc01bf3c2e1f90b4e55f426ed8f4a1eeac"
+ "checksum docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8"
+ "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
+ "checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83"
+@@ -836,7 +854,7 @@ dependencies = [
+ "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
+ "checksum gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)" = "40899336fb50db0c78710f53e87afc54d8c7266fb76262fecc78ca1a7f09deae"
+ "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
+-"checksum git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "046ae03385257040b2a35e56d9669d950dd911ba2bf48202fbef73ee6aab27b2"
++"checksum git2 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "40a111aecd59985496012976beca164b4f6c930d507a099831e06b07f19d54f1"
+ "checksum git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "68676bc784bf0bef83278898929bf64a251e87c0340723d0b93fa096c9c5bf8e"
+ "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
+ "checksum hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4"
+@@ -845,7 +863,7 @@ dependencies = [
+ "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+ "checksum lazy_static 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4732c563b9a21a406565c4747daa7b46742f082911ae4753f390dc9ec7ee1a97"
+ "checksum libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135"
+-"checksum libgit2-sys 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d951fd5eccae07c74e8c2c1075b05ea1e43be7f8952245af8c2840d1480b1d95"
++"checksum libgit2-sys 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "82fc20bd8beefe7c9f98aae2d3cff78e57f544cdd83d58fe181ec37a5fbe0c77"
+ "checksum libssh2-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "91e135645c2e198a39552c8c7686bb5b83b1b99f64831c040a6c2798a1195934"
+ "checksum libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e5ee912a45d686d393d5ac87fac15ba0ba18daae14e8e7543c63ebf7fb7e970c"
+ "checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad"
+@@ -904,6 +922,7 @@ dependencies = [
+ "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47"
+ "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
+ "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
++"checksum vcpkg 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7ed0f6789c8a85ca41bbc1c9d175422116a9869bd1cf31bb08e1493ecce60380"
+ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+ "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+ "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+-- 
+2.16.2
+
diff --git a/dev-lang/rust/patches/rust-1.18.0.patchset b/dev-lang/rust/patches/rust-1.18.0.patchset
new file mode 100644
index 000000000..aaa8d728b
--- /dev/null
+++ b/dev-lang/rust/patches/rust-1.18.0.patchset
@@ -0,0 +1,228 @@
+From f8a252b85663a5bedb19b8a3a284124f46d392ef Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Wed, 20 Sep 2017 07:26:48 +0000
+Subject: [PATCH 1/6] Haiku: disable rpath as standard option on the compiler
+
+---
+ src/librustc_back/target/haiku_base.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/librustc_back/target/haiku_base.rs b/src/librustc_back/target/haiku_base.rs
+index bfdc9fa..3fd0389 100644
+--- a/src/librustc_back/target/haiku_base.rs
++++ b/src/librustc_back/target/haiku_base.rs
+@@ -16,7 +16,7 @@ pub fn opts() -> TargetOptions {
+         linker: "cc".to_string(),
+         dynamic_linking: true,
+         executables: true,
+-        has_rpath: true,
++        has_rpath: false,
+         target_family: Some("unix".to_string()),
+         linker_is_gnu: true,
+         .. Default::default()
+-- 
+2.7.0
+
+
+From c31264103ad45685d400ad213b924d87ac016d85 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Wed, 20 Sep 2017 07:27:38 +0000
+Subject: [PATCH 2/6] Haiku: add missing F_RDLCK constant
+
+---
+ src/librustc_data_structures/flock.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/librustc_data_structures/flock.rs b/src/librustc_data_structures/flock.rs
+index 26417e3..32f0fd4 100644
+--- a/src/librustc_data_structures/flock.rs
++++ b/src/librustc_data_structures/flock.rs
+@@ -113,6 +113,7 @@ mod imp {
+             pub l_sysid: libc::c_int,
+         }
+ 
++        pub const F_RDLCK: libc::c_short = 0x0040;
+         pub const F_UNLCK: libc::c_short = 0x0200;
+         pub const F_WRLCK: libc::c_short = 0x0400;
+         pub const F_SETLK: libc::c_int = 0x0080;
+-- 
+2.7.0
+
+
+From cf245f081dc220efb6645f3c06e07745a1eadd91 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Wed, 20 Sep 2017 17:36:59 +0000
+Subject: [PATCH 3/6] Haiku: reduce stack memory to 16MB (max on Haiku)
+
+---
+ src/librustdoc/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
+index 2a6134f..5c126fc 100644
+--- a/src/librustdoc/lib.rs
++++ b/src/librustdoc/lib.rs
+@@ -102,7 +102,7 @@ struct Output {
+ }
+ 
+ pub fn main() {
+-    const STACK_SIZE: usize = 32_000_000; // 32MB
++    const STACK_SIZE: usize = 16_000_000; // 16MB on Haiku
+     env_logger::init().unwrap();
+     let res = std::thread::Builder::new().stack_size(STACK_SIZE).spawn(move || {
+         let s = env::args().collect::<Vec<_>>();
+-- 
+2.7.0
+
+
+From d4df22eed703c3b8413a0dee4a71807a23c66f20 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Mon, 9 Oct 2017 21:31:02 +0000
+Subject: [PATCH 4/6] Haiku: link libunwind to libgcc_s
+
+---
+ src/libunwind/build.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
+index 9b8099d..15557ad 100644
+--- a/src/libunwind/build.rs
++++ b/src/libunwind/build.rs
+@@ -39,5 +39,7 @@ fn main() {
+         println!("cargo:rustc-link-lib=static-nobundle=pthread");
+     } else if target.contains("fuchsia") {
+         println!("cargo:rustc-link-lib=unwind");
++    } else if target.contains("haiku") {
++    	println!("cargo:rustc-link-lib=gcc_s");
+     }
+ }
+-- 
+2.7.0
+
+
+From 816c3c70b1c7bd051bfb09ad20043f5da696e02e Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Tue, 10 Oct 2017 06:32:35 +0000
+Subject: [PATCH 5/6] Haiku: depend on a num_cpus package with Haiku support
+
+---
+ src/Cargo.lock           | 6 +++---
+ src/bootstrap/Cargo.toml | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Cargo.lock b/src/Cargo.lock
+index f4c3571..0b785a3 100644
+--- a/src/Cargo.lock
++++ b/src/Cargo.lock
+@@ -78,7 +78,7 @@ dependencies = [
+  "gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)",
+  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
+  "toml 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -299,7 +299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "num_cpus"
+-version = "0.2.13"
++version = "1.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1004,7 +1004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ "checksum mdbook 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "2598843aeda0c5bb2e8e4d714564f1c3fc40f7844157e34563bf96ae3866b56e"
+ "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
+ "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99"
+-"checksum num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "cee7e88156f3f9e19bdd598f8d6c9db7bf4078f99f8381f43a55b09648d1a6e3"
++"checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
+ "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842"
+ "checksum pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8"
+ "checksum pulldown-cmark 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9ab1e588ef8efd702c7ed9d2bd774db5e6f4d878bb5a1a9f371828fbdff6973"
+diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
+index 1eda160..6bcb4e6 100644
+--- a/src/bootstrap/Cargo.toml
++++ b/src/bootstrap/Cargo.toml
+@@ -27,7 +27,7 @@ test = false
+ build_helper = { path = "../build_helper" }
+ cmake = "0.1.17"
+ filetime = "0.1"
+-num_cpus = "0.2"
++num_cpus = "1.4"
+ toml = "0.1"
+ getopts = "0.2"
+ rustc-serialize = "0.3"
+-- 
+2.7.0
+
+
+From e9d851a1e77448b9f06d0e868b20ea744bd4eff3 Mon Sep 17 00:00:00 2001
+From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
+Date: Mon, 24 Apr 2017 14:21:36 +0000
+Subject: [PATCH 6/6] Haiku: add missing cases of using LIBRARY_PATH
+
+---
+ src/bootstrap/bootstrap.py           | 3 +++
+ src/bootstrap/util.rs                | 2 ++
+ src/librustc_back/dynamic_lib.rs     | 2 ++
+ src/tools/compiletest/src/procsrv.rs | 2 ++
+ 4 files changed, 9 insertions(+)
+
+diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
+index 6cd9496..5d05db0 100644
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -367,6 +367,9 @@ class RustBuild(object):
+         env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
+                                    (os.pathsep + env["DYLD_LIBRARY_PATH"]) \
+                                    if "DYLD_LIBRARY_PATH" in env else ""
++        env["LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
++                                   (os.pathsep + env["LIBRARY_PATH"]) \
++                                   if "LIBRARY_PATH" in env else ""
+         env["PATH"] = os.path.join(self.bin_root(), "bin") + \
+                       os.pathsep + env["PATH"]
+         if not os.path.isfile(self.cargo()):
+diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
+index dab20f4..e01c06b 100644
+--- a/src/bootstrap/util.rs
++++ b/src/bootstrap/util.rs
+@@ -139,6 +139,8 @@ pub fn dylib_path_var() -> &'static str {
+         "PATH"
+     } else if cfg!(target_os = "macos") {
+         "DYLD_LIBRARY_PATH"
++    } else if cfg!(target_os = "haiku") {
++        "LIBRARY_PATH"
+     } else {
+         "LD_LIBRARY_PATH"
+     }
+diff --git a/src/librustc_back/dynamic_lib.rs b/src/librustc_back/dynamic_lib.rs
+index 38e6006..e6f305c 100644
+--- a/src/librustc_back/dynamic_lib.rs
++++ b/src/librustc_back/dynamic_lib.rs
+@@ -68,6 +68,8 @@ impl DynamicLibrary {
+             "PATH"
+         } else if cfg!(target_os = "macos") {
+             "DYLD_LIBRARY_PATH"
++        } else if cfg!(target_os = "haiku") {
++            "LIBRARY_PATH"
+         } else {
+             "LD_LIBRARY_PATH"
+         }
+diff --git a/src/tools/compiletest/src/procsrv.rs b/src/tools/compiletest/src/procsrv.rs
+index 3d8f229..dbda8f4 100644
+--- a/src/tools/compiletest/src/procsrv.rs
++++ b/src/tools/compiletest/src/procsrv.rs
+@@ -20,6 +20,8 @@ pub fn dylib_env_var() -> &'static str {
+         "PATH"
+     } else if cfg!(target_os = "macos") {
+         "DYLD_LIBRARY_PATH"
++    } else if cfg!(target_os = "haiku") {
++        "LIBRARY_PATH"
+     } else {
+         "LD_LIBRARY_PATH"
+     }
+-- 
+2.7.0
+
diff --git a/dev-lang/rust/patches/rust-installer-1.18.0.patchset b/dev-lang/rust/patches/rust-installer-1.18.0.patchset
new file mode 100644
index 000000000..96112eee2
--- /dev/null
+++ b/dev-lang/rust/patches/rust-installer-1.18.0.patchset
@@ -0,0 +1,27 @@
+From 656226e6b32bd9d5af2c3c371bd84a68e518db80 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Mon, 9 Mar 2015 22:27:02 +0100
+Subject: [PATCH] Haiku: detect OS
+
+---
+ install-template.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/install-template.sh b/install-template.sh
+index dcc1ee0..90afec2 100644
+--- a/install-template.sh
++++ b/install-template.sh
+@@ -364,6 +364,10 @@ get_host_triple() {
+             _ostype=pc-windows-gnu
+             ;;
+ 
++	Haiku*)
++            _ostype=unknown-haiku
++            ;;
++
+ 	*)
+ 	    err "unknown value from uname -s: $_uname_value"
+ 	    ;;
+-- 
+2.7.0
+
diff --git a/dev-lang/rust/patches/rust-rls-1.18.0.patchset b/dev-lang/rust/patches/rust-rls-1.18.0.patchset
new file mode 100644
index 000000000..dd3a20953
--- /dev/null
+++ b/dev-lang/rust/patches/rust-rls-1.18.0.patchset
@@ -0,0 +1,175 @@
+From a95307f2718141e574e70d104a3db8cf58a13a50 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Sun, 22 Oct 2017 11:45:45 +0000
+Subject: [PATCH 1/3] Haiku: depend on a num_cpus package with Haiku support
+
+---
+ Cargo.lock | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index b463253..96f1864 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -86,7 +86,7 @@ dependencies = [
+  "libgit2-sys 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -356,7 +356,7 @@ dependencies = [
+  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "mime 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
+  "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -568,7 +568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "num_cpus"
+-version = "1.3.0"
++version = "1.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1268,7 +1268,7 @@ dependencies = [
+ "checksum num-integer 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "21e4df1098d1d797d27ef0c69c178c3fab64941559b290fcae198e0825c9c8b5"
+ "checksum num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e"
+ "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99"
+-"checksum num_cpus 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a18c392466409c50b87369414a2680c93e739aedeb498eb2bff7d7eb569744e2"
++"checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
+ "checksum openssl 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8aa0eb7aad44f0da6f7dda13ddb4559d91a0f40cfab150b1f76ad5b39ec523f"
+ "checksum openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919"
+ "checksum openssl-sys 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "14f5bfd12054d764510b887152d564ba11d99ae24ea7d740781778f646620576"
+-- 
+2.7.0
+
+
+From c605c96a2256ab37eab8ab29408e02d8df80aa35 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Sun, 22 Oct 2017 12:14:26 +0000
+Subject: [PATCH 2/3] Haiku: depend on a compatible version of fs2
+
+---
+ Cargo.lock | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 96f1864..ae7fb3b 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -77,7 +77,7 @@ dependencies = [
+  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fs2 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -277,7 +277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "fs2"
+-version = "0.4.1"
++version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1234,7 +1234,7 @@ dependencies = [
+ "checksum filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922"
+ "checksum flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4e4d0c15ef829cbc1b7cda651746be19cceeb238be7b1049227b14891df9e25"
+ "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
+-"checksum fs2 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34edaee07555859dc13ca387e6ae05686bb4d0364c95d649b6dab959511f4baf"
++"checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
+ "checksum gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)" = "40899336fb50db0c78710f53e87afc54d8c7266fb76262fecc78ca1a7f09deae"
+ "checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
+ "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
+-- 
+2.7.0
+
+
+From 8e5cadbc4f777c368a35aa8dff4a76046c9537e6 Mon Sep 17 00:00:00 2001
+From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
+Date: Sun, 22 Oct 2017 14:11:39 +0000
+Subject: [PATCH 3/3] Haiku: depend on a patched version of Cargo
+
+---
+ Cargo.lock | 12 ++++++------
+ Cargo.toml |  2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index ae7fb3b..b79e77d 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2,7 +2,7 @@
+ name = "rls"
+ version = "0.1.0"
+ dependencies = [
+- "cargo 0.19.0 (git+https://github.com/rust-lang/cargo)",
++ "cargo 0.19.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.19.0)",
+  "derive-new 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "hyper 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -66,11 +66,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ [[package]]
+ name = "cargo"
+ version = "0.19.0"
+-source = "git+https://github.com/rust-lang/cargo#c416fb60b11ecfd2a1ba0fb8567c9a92590b5d28"
++source = "git+https://github.com/nielx/cargo?branch=cargo-haiku-0.19.0#e8f4c7b03f53840123b9bbc695dd0db0dc3ba2ee"
+ dependencies = [
+  "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crates-io 0.8.0 (git+https://github.com/rust-lang/cargo)",
++ "crates-io 0.8.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.19.0)",
+  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -153,7 +153,7 @@ dependencies = [
+ [[package]]
+ name = "crates-io"
+ version = "0.8.0"
+-source = "git+https://github.com/rust-lang/cargo#c416fb60b11ecfd2a1ba0fb8567c9a92590b5d28"
++source = "git+https://github.com/nielx/cargo?branch=cargo-haiku-0.19.0#e8f4c7b03f53840123b9bbc695dd0db0dc3ba2ee"
+ dependencies = [
+  "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1213,13 +1213,13 @@ dependencies = [
+ "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
+ "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
+ "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
+-"checksum cargo 0.19.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
++"checksum cargo 0.19.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.19.0)" = "<none>"
+ "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
+ "checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
+ "checksum clap 2.19.3 (registry+https://github.com/rust-lang/crates.io-index)" = "95b78f3fe0fc94c13c731714363260e04b557a637166f33a4570d3189d642374"
+ "checksum cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "d18d68987ed4c516dcc3e7913659bfa4076f5182eea4a7e0038bb060953e76ac"
+ "checksum cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e3d6405328b6edb412158b3b7710e2634e23f3614b9bb1c412df7952489a626"
+-"checksum crates-io 0.8.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
++"checksum crates-io 0.8.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.19.0)" = "<none>"
+ "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+ "checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b"
+ "checksum curl-sys 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d909dc402ae80b6f7b0118c039203436061b9d9a3ca5d2c2546d93e0a61aaa"
+diff --git a/Cargo.toml b/Cargo.toml
+index 1ca0bd6..01f4ca3 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -4,7 +4,7 @@ version = "0.1.0"
+ authors = ["Jonathan Turner <jturner@mozilla.com>"]
+ 
+ [dependencies]
+-cargo = { git = "https://github.com/rust-lang/cargo" }
++cargo = { git = "https://github.com/nielx/cargo", branch="cargo-haiku-0.19.0" }
+ derive-new = "0.3"
+ env_logger = "0.3"
+ languageserver-types = { git = "https://github.com/gluon-lang/languageserver-types" }
+-- 
+2.7.0
+
diff --git a/dev-lang/rust/rust-1.18.0.recipe b/dev-lang/rust/rust-1.18.0.recipe
new file mode 100644
index 000000000..f81ccaad1
--- /dev/null
+++ b/dev-lang/rust/rust-1.18.0.recipe
@@ -0,0 +1,217 @@
+SUMMARY="Modern and safe systems programming language"
+DESCRIPTION="Rust is a systems programming language that runs blazingly fast, prevents almost all crashes*, and eliminates data races."
+HOMEPAGE="http://www.rust-lang.org/"
+LICENSE="MIT"
+COPYRIGHT="2017, The Rust Project Developers"
+srcGitRev="1.18.0"
+srcGitRev2="d812b1641f798e38de9fa372476d42cdb6908c01"
+srcGitRev3="4f994850808a572e2cc8d43f968893c8e942e9bf"
+srcGitRev4="da282f1bb7277b4d30fa1599ee29ad8eb4dd2a92"
+srcGitRev5="c34a802d1eb037b44c5252078c7270b5472e0f65"
+srcGitRev6="2e951c3ae354bcbd2e50b30798e232949a926b75"
+cargoVersion="0.19.0"
+srcGitRev8="616b98444ff4eb5260deee95ee3e090dfd98b947"
+srcGitRev9="6b0de90d87dda15e323ef24cdf7ed873ac5cf4d3"
+srcGitRev10="ad7de198561b3a12217ea2da76d796d9c7fc0ed3"
+srcGitRev11="6ecff95fdc3ee7ceed2b9b0cc1a3a64876860bce"
+srcGitRev12="0.1.6"
+SOURCE_URI="https://github.com/rust-lang/rust/archive/$srcGitRev.tar.gz"
+SOURCE_URI_2="https://github.com/rust-lang/compiler-rt/archive/$srcGitRev2.tar.gz"
+SOURCE_URI_3="https://github.com/rust-lang/rust-installer/archive/$srcGitRev3.tar.gz"
+SOURCE_URI_4="https://github.com/rust-lang/hoedown/archive/$srcGitRev4.tar.gz"
+SOURCE_URI_5="https://github.com/rust-lang/libc/archive/$srcGitRev5.tar.gz"
+SOURCE_URI_6="https://github.com/rust-lang/llvm/archive/$srcGitRev6.tar.gz"
+SOURCE_URI_7="https://github.com/rust-lang/cargo/archive/$cargoVersion.tar.gz"
+SOURCE_URI_8="https://github.com/rust-lang-nursery/nomicon/archive/$srcGitRev8.tar.gz"
+SOURCE_URI_9="https://github.com/rust-lang-nursery/reference/archive/$srcGitRev9.tar.gz"
+SOURCE_URI_10="https://github.com/rust-lang/book/archive/$srcGitRev10.tar.gz"
+SOURCE_URI_11="https://github.com/rust-lang-nursery/rls/archive/$srcGitRev11.tar.gz"
+SOURCE_URI_12="https://github.com/alexcrichton/cargo-vendor/archive/$srcGitRev12.tar.gz"
+SOURCE_FILENAME="rust-$srcGitRev.tar.gz"
+CHECKSUM_SHA256="77720ad4bf93175a73a94507fbf68c669bb66cf7c9a071f59a25510a4dfa1dbd"
+CHECKSUM_SHA256_2="a1d7a2c248c01499518f54735038030651c62fe8f0d580987ac52be20a13e93b"
+CHECKSUM_SHA256_3="dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae"
+CHECKSUM_SHA256_4="623889a326754e93a4a7a8a3487699ea786f4ca9b118f7468c12f8b9966905e6"
+CHECKSUM_SHA256_5="3616106943b3d3a345fc85ec02e9e125f80f60ea2f9384d4c5d6286c7142cfbd"
+CHECKSUM_SHA256_6="a85cc4847370573d194af95d6794304479d1024863c754d9b4e2499478c41393"
+CHECKSUM_SHA256_7="9ea59d17a7fa81aa4bdefa2bb45a5315219414386753eaf0988cadd465550b40"
+CHECKSUM_SHA256_8="ee080d47da2204094195362d91818cd56350c9c7e0969d78fc6d55c59529fce4"
+CHECKSUM_SHA256_9="7fca934f5ab6c08ba38376a6847cf6c6a1405794148d107bffa715c46f634bb4"
+CHECKSUM_SHA256_10="31d77c9ccb2924f8381a09b6eb8b7efe74fbc280c581a21728e0c50878413ec0"
+CHECKSUM_SHA256_11="e1ad31337422f9b05f57f43266048935f246cc35ca53671feceb9e6208bc4b40"
+CHECKSUM_SHA256_12="927f6b782f0be32c6027335bbd49fb40cffa922095ffacc9a0aca78e45023f1a"
+SOURCE_DIR="rust-$srcGitRev"
+PATCHES="rust-$portVersion.patchset"
+PATCHES_3="rust-installer-$portVersion.patchset"
+PATCHES_7="cargo-$cargoVersion.patchset"
+PATCHES_11="rust-rls-$portVersion.patchset"
+PATCHES_12="cargo-vendor-$srcGitRev12.patchset"
+REVISION="1"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	rust$secondaryArchSuffix = $portVersion
+	cmd:rustc = $portVersion
+	cmd:rustdoc = $portVersion
+	cmd:rust_gdb = $portVersion
+	cmd:rust_lldb = $portVersion
+	cmd:cargo$secondaryArchSuffix = $cargoVersion
+	cmd:rls$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libcurl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cargo$secondaryArchSuffix == 0.18.0
+	cmd:cmake
+	cmd:cmp
+	cmd:file
+	cmd:find
+	cmd:git
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:python
+	cmd:rustc == 1.17.0
+	cmd:sed
+	cmd:tar
+	cmd:which
+	cmd:xargs
+	"
+
+BUILD()
+{
+	# With the new build system, Rust always makes a tarball with the source
+	# In older recipes we symlinked the other git submodules, now we have to
+	# copy them
+	rm -rf cargo src/compiler-rt src/llvm src/rust-installer \
+	       src/liblibc src/rt/hoedown src/doc/nomicon src/doc/reference \
+	       src/doc/book rls
+	cp -r /sources-2/compiler-rt-$srcGitRev2 src/compiler-rt
+	cp -r /sources-3/rust-installer-$srcGitRev3 src/rust-installer
+	cp -r /sources-4/hoedown-$srcGitRev4 src/rt/hoedown
+	cp -r /sources-5/libc-$srcGitRev5 src/liblibc
+	cp -r /sources-6/llvm-$srcGitRev6 src/llvm
+	cp -r /sources-7/cargo-$cargoVersion cargo
+	cp -r /sources-8/nomicon-$srcGitRev8 src/doc/nomicon
+	cp -r /sources-9/reference-$srcGitRev9 src/doc/reference
+	cp -r /sources-10/book-$srcGitRev10 src/doc/book
+	cp -r /sources-11/rls-$srcGitRev11 rls
+
+	# write the build configuration
+	cat >config.toml <<- EOL
+	[llvm]
+	targets = "X86"
+
+	[build]
+	cargo = "/$relativeBinDir/cargo"
+	rustc = "/boot/system/bin/rustc"
+	submodules = false
+	extended = true
+
+	[install]
+	prefix = "$prefix"
+	libdir = "$relativeLibDir"
+	mandir = "$relativeManDir"
+	docdir = "$relativeDevelopDocDir"
+
+	[rust]
+	channel = "stable"
+	use-jemalloc = false
+	rpath = false
+EOL
+
+	# the install step of rust depends on the cargo vendor command
+	# build it separately here
+	cd /sources-12/cargo-vendor-$srcGitRev12
+	cargo install --force
+
+	# now build rust and cargo
+	cd /sources/rust-$srcGitRev
+	# Note: in the previous recipe the --verbose flag was added, but
+	# this causes a bug in the Rust build. See issue #42543 on github
+	./x.py dist
+}
+
+INSTALL()
+{
+	# we will manually invoke the install scripts
+	if [ $effectiveTargetArchitecture = x86 ]; then
+		architecture="i686-unknown-haiku"
+	fi
+	if [ $effectiveTargetArchitecture = x86_64 ]; then
+		architecture="x86_64-unknown-haiku"
+	fi
+
+	# let's install the packages one by one
+	cd /sources/rust-$srcGitRev/build/tmp/dist/
+	for module in "rust-docs-$srcGitRev-$architecture"     \
+	              "rust-std-$srcGitRev-$architecture"      \
+	              "rustc-$srcGitRev-$architecture"         \
+	              "rust-analysis-$srcGitRev-$architecture" \
+	              "cargo-$cargoVersion-$architecture"      \
+	              "rls-0.1.0-$architecture"
+	do
+		./$module/install.sh                               \
+				--prefix=$prefix                           \
+				--docdir=$developDocDir                    \
+				--libdir=$libDir                           \
+				--mandir=$manDir                           \
+				--disable-ldconfig
+	done
+
+	# move the cargo and binaries (in case of a secondary arch)
+	if [ -n "$secondaryArchSuffix" ]; then
+		mkdir -p $binDir
+		mv $prefix/bin/cargo $binDir/cargo
+		mv $prefix/bin/rls $binDir/rls
+	fi
+
+	# move other cargo artifacts
+	mkdir -p $dataDir
+	mv $prefix/share/zsh $dataDir
+	mv $prefix/etc/bash_completions.d $dataDir
+	rm -rf $prefix/share $prefix/etc
+
+	# move the `rustlib` folder to the developLibDirs (as it is a framework of sorts)
+	# do create a link in $prefix/lib as that is where rustc expects things to live
+	# Note; this actually seems to be a bug in the Rust build system. The path
+	# to rustlib is hardcoded in the rustc binary, but it does allow it to be
+	# set to libdir_relative (see config.rs in the bootstrap tool). This variable
+	# is only set when the configure script is used to generate the config, not
+	# with config.toml
+	mkdir -p $developLibDir
+	mv $libDir/rustlib $developLibDir
+	cd $prefix/lib
+	ln -s $developLibDir/rustlib rustlib
+
+	# clean out unneccesary files created by the rust installer
+	rm $developLibDir/rustlib/components
+	rm $developLibDir/rustlib/install.log
+	rm $developLibDir/rustlib/manifest-cargo
+	rm $developLibDir/rustlib/manifest-rls
+	rm $developLibDir/rustlib/manifest-rust-analysis-*haiku
+	rm $developLibDir/rustlib/manifest-rust-docs
+	rm $developLibDir/rustlib/manifest-rust-std-*-haiku
+	rm $developLibDir/rustlib/manifest-rustc
+	rm $developLibDir/rustlib/rust-installer-version
+	rm $developLibDir/rustlib/uninstall.sh
+}
+
+TEST()
+{
+	make check
+}