aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2018-12-29 14:19:55 -0500
committerAnthony G. Basile <blueness@gentoo.org>2018-12-29 14:19:55 -0500
commitb942bdbb128e2a597de7270c19576f1fd9373900 (patch)
tree9fb60bbf4db68aaea20847b5df53c25c2b4c5248 /dev-lang
parentdev-python/numpy: in tree version works (diff)
downloadmusl-b942bdbb128e2a597de7270c19576f1fd9373900.tar.gz
musl-b942bdbb128e2a597de7270c19576f1fd9373900.tar.bz2
musl-b942bdbb128e2a597de7270c19576f1fd9373900.zip
dev-lang/rust and dev-util/cargo: move to 'rust' branch
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/rust/Manifest23
-rw-r--r--dev-lang/rust/files/1.25.0/0001-Require-static-native-libraries-when-linking-static-.patch44
-rw-r--r--dev-lang/rust/files/1.25.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch416
-rw-r--r--dev-lang/rust/files/1.25.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch25
-rw-r--r--dev-lang/rust/files/1.25.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch24
-rw-r--r--dev-lang/rust/files/1.25.0/0005-Fix-LLVM-build.patch26
-rw-r--r--dev-lang/rust/files/1.25.0/0006-Fix-rustdoc-for-cross-targets.patch36
-rw-r--r--dev-lang/rust/files/1.25.0/0007-Add-openssl-configuration-for-musl-targets.patch41
-rw-r--r--dev-lang/rust/files/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch36
-rw-r--r--dev-lang/rust/files/1.25.0/0009-liblibc.patch17
-rw-r--r--dev-lang/rust/files/1.25.0/0010-llvm.patch20
-rw-r--r--dev-lang/rust/files/1.26.2/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch381
-rw-r--r--dev-lang/rust/files/1.26.2/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch23
-rw-r--r--dev-lang/rust/files/1.27.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch384
-rw-r--r--dev-lang/rust/files/1.27.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch12
-rw-r--r--dev-lang/rust/files/rust-1.26.0-libressl-2.7.0.patch481
-rw-r--r--dev-lang/rust/files/rust-1.27.0-libressl-2.7.0.patch24
-rw-r--r--dev-lang/rust/metadata.xml18
-rw-r--r--dev-lang/rust/rust-1.25.0.ebuild273
-rw-r--r--dev-lang/rust/rust-1.26.2.ebuild353
-rw-r--r--dev-lang/rust/rust-1.27.0.ebuild354
21 files changed, 0 insertions, 3011 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
deleted file mode 100644
index acb4a66..0000000
--- a/dev-lang/rust/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-DIST rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz 83752132 BLAKE2B a0d49238ccaa3547764c07a215a0e02c813ae18cd6aca3baae1d9a10dee87d73526552b7ff6e4936ec414794d1143041aa8f92d244e2e4fe5aaefcb12a6dcb0a SHA512 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
-DIST rust-1.25.0-aarch64-unknown-linux-musl.tar.xz 93680552 BLAKE2B 4340dc737ed00c7c5f2a9ac9364f8476d04d1457ea220982feaaef2e2999f393e330320015ecacc08c75eec52b0449cc801f4a12e4fc6856fe4e2c88406e2573 SHA512 5b8056408e98a4f3ac376e6e54e5b3cb846ab7c6f448a4a36d478362e97df65eb45648bef8c1777ca0a0bdb4e660ed445057c5714016a7907c32878986566427
-DIST rust-1.25.0-arm-unknown-linux-gnueabi.tar.xz 86598600 BLAKE2B 0dac7ae9ef2fbd6df6c1e5b6d1b54137fb2aa10b8e642b367c8b4f25a11ddb8af25abe6ce5086e1c2fac32fe86e64da13d223860c2f935a745eb42814e7cf33a SHA512 f5f4c76f41a1e90d1b2a960becc70194dee10ab81e0ee84e66199b65a36767fcc4cf7979a7224036d79e493c35ac3c8af542ebd188228877d90444e2cdc794f5
-DIST rust-1.25.0-arm-unknown-linux-musleabi.tar.xz 94630288 BLAKE2B dc834e307f3327f436c8f8886d671e320d69ed539f0640c9fa30d411f693d8eef3fb4f3615e79613c84023cd4e8d84235ddf74935a457fa0fa3ffbb73b908613 SHA512 19cf61dec176c65c7d4271b9d2e9de8b1dd417ee1b9946c9f62fdef584280aed05c0974c82f1b2e3765341be7c1a966bb7b717b6812f59e64b94c29245da36fe
-DIST rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.xz 87160132 BLAKE2B 2bf8cb80189a18f6a5e453279e9ec8dcefb78ab059b19b5104e1bfe7091bf4e3e832abf993e550aa9ef41eeaec34249f84b1c538651336bf46b6df5335deb163 SHA512 63bf72c6011f9ccb052496d09d1ecc37d5c2ec8260ade2ef9b7bca6fb0dc8b77f5d27eb77c1136cef6f986f2fec90577399b0f9c57e757838904ab4030f93f6d
-DIST rust-1.25.0-armv7-unknown-linux-musleabihf.tar.xz 94496008 BLAKE2B 6f88f88097e70309ba03fa8b474c8352bdcdc265b462c80641fb771fd5f1fb852302bf3a2ca4660a15c36c9bdaa769310d5a50e3b6a96a9b2b07c487272c31fd SHA512 c2d451644d13e67b98bc7a84df787f4996ee5dbfe42feccfed51abd1fcf4b2d50f894aa57502122052d107d685634737fafaa398d6814098fba6015f84aadec7
-DIST rust-1.25.0-i686-unknown-linux-gnu.tar.xz 102453124 BLAKE2B 8986ebab6a7a9d00f716541484e0cfd4f33ca592880097217e718cb79cae77aad8ecaf6856f72386d2419b4dcc0d99425fb37f72b4830d6a20a74166f2c534d0 SHA512 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f
-DIST rust-1.25.0-i686-unknown-linux-musl.tar.xz 100253196 BLAKE2B 2bc6d9d2a1dfabd8d88733921c3f1a5558174e8e915bc6f2a38f71097603796480d88bfb40c4ebcc2a877290906079099a1f7c965931a5378fffde556193905f SHA512 93eb29d86e209e0bc2aa92f3e534393ad37658a6b4f91ae3da7f3aaf05e82a5c04376f2e6d24410f0a1647ba3d7c6945254c74704084d53bf6be806a064754c1
-DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz 111059260 BLAKE2B ae982976a735c2b5226722207a983bb638cb7c0cb0ceb6b438456d54fac86a5d1892b535f01ac463157205c0ae27ae876482f6ac1fa269a9ec3e1177be0cef2e SHA512 aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78
-DIST rust-1.25.0-x86_64-unknown-linux-musl.tar.xz 97724224 BLAKE2B ad0accfb670acf2a02f9bb1c8e6a80ab7be2d1e0f01bc2da13744ab164774cc318255d78a657b84ad0f97ab1ee3fc4a53b4cf1ee71ba52984cbcd52bd64f2387 SHA512 ee250193db5e20edb80fe864609b1c16ca5da5f2ca16700f5f938195d43dd5d3de8cd138f64feebd73f77fbf4f61196459c13420ba6c4f451b9db266db92219a
-DIST rust-1.26.2-aarch64-unknown-linux-gnu.tar.xz 90964988 BLAKE2B 7e5de737ff2b4711e0a5b3085f10c3f2918fc5823dcb52bc5f897a5617b65d648d5e59664dbfaa904ff08923d1bbd11aae21349760fefef6ff18ea0e45391e07 SHA512 b565ec988d3b946dabc8902eba60b446070e77b7c27aa98d981b7ba5e9285bda95565627600e6be057970de5006d9640ef77fa920849160f5cf98508b48d1673
-DIST rust-1.26.2-aarch64-unknown-linux-musl.tar.xz 96634640 BLAKE2B fe74fec5c20d7d74e261b30cc3e3eb375da35332ab54e528eca78270608c6830fc4ed15bfa0f8126fc4e77f8476ab9c008565191667ba278713194e38c2d7b59 SHA512 2643021d99bafc3da58bab7a40aeb9c0127b099b26b59c4ebb073d7f807262e65ec8b12618fb8fe5d75fa8809319c3b08518371c04f406cb7fcdbf795b3bdb35
-DIST rust-1.26.2-arm-unknown-linux-gnueabi.tar.xz 98267104 BLAKE2B ae44fcead124e5e3993240be0c8a46e545df5d045d39184cfada86d9a820fa30a771396a2ced86c2454aef224951e85cf0b6965c13ed98a3024e07d4ca1ec6a9 SHA512 a96295ef2d0eca5a682e3b3bcfe3b3ffeb5bbe45bc949f467cfd1e7ac7252d74e86d2d8f25e5722e75e7f537afeb3b0ae9054bd3908916ea461623f8c13ba5bf
-DIST rust-1.26.2-arm-unknown-linux-musleabi.tar.xz 97679732 BLAKE2B e5bdd376c1a5a1d8ebf3e8cacd80f0a8165e24ed8c7ed3755cf2ca7f3688f3f278534021e8d1487875cab657ad9391023577692afaff45f001e52d76d9417058 SHA512 a1e20e2a93b40ec8bc8a90d9e5b57801e7fa79649b45ae6ca1133ec24779edc00ff73b5f8a1836856b2cdd78b643390518d58694e5661834b6091a5d6e924660
-DIST rust-1.26.2-armv7-unknown-linux-gnueabihf.tar.xz 98828932 BLAKE2B 2f60e65128bd32d97422d82d99f5c5447d1c1e77582028089d52208e3ede4af5e72c278a3fb5001348c864087f3e85af05604a0b6078891c5ed812d745840d93 SHA512 7b8e3f39a62b7b5fdaa6d53e5638de26968799d97b5d53e09bf49456b02f968495cff4757f25d38bc3393ca33dc1b9da353ec290ba9416770e082548aa5079ac
-DIST rust-1.26.2-armv7-unknown-linux-musleabihf.tar.xz 97326548 BLAKE2B c955fe3fd4dbdc12c6c8101538a930169dc62e7461964b8f900e8afd3973fea783116ed25aff5db15eded8173377db412c67232b12e0cba6a3278793f08de2ae SHA512 ed1d9828d2f12e782fd73865a0403c7b26c11cab665c635308e8e1cd23e6101402b448f0334f33b33193162bb9e6b30eba8a541b3d128925407f17b9d8f4f9f3
-DIST rust-1.26.2-i686-unknown-linux-gnu.tar.xz 143090096 BLAKE2B 7871fa4e4d0f320ff949cd31cefa116bc7b741927626958e1d10197f05fc9a662b8d6c21ddd4d2910700e6f7273e4fc18738e6ff58cd85b9af4ed25eceea31d9 SHA512 859b5b72c78cca8cd473012599ca12539ef9a5ee38d1aaaad024019fd84220e344e1cd0efd2b027ef333555b158b23529f35ceb5d59d76c35e7946b5fe4a8a52
-DIST rust-1.26.2-i686-unknown-linux-musl.tar.xz 103964468 BLAKE2B f1bcc5be07239917517302389c91ca68427f4f50f98ca38832606377b011f4c7d50159b0481fe9075b497d1493b4d40445d8026e115fbae1c970f459d6e8a63a SHA512 528a761a22ee22007de4511a46d97db3cab625622d4f94de5305fbbefb6a5f7582826aae3bcb459f91a3f57d535153b8cb35b692806060ced92655cdf9c81e2a
-DIST rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz 138609432 BLAKE2B 54507a8ce3ab2676e6e66852b6d3f1a47ca07ad4b56383f6247149309a0f60f67fbf0a6ba27d968c24340c07d7d5074942c6eaccbc1207c5e75fd9a6f47b2481 SHA512 29e474b0eab4dd2ffa0b964d83f52ffce530e75c4193e307410ef6d20ef9ad2b300a4f467bdf06b3311157340e9295cb9b1efdcf08dafee66979b076c2afba7e
-DIST rust-1.26.2-x86_64-unknown-linux-musl.tar.xz 101703244 BLAKE2B d69fafba82b9e98f5c9d45c606a732c1a698141f543f7d8671a715cd95dbb4948def4e8593f7355ec88b0c7aa7199dec65d7af0acec0857095641dab6df19f0c SHA512 563ed60897c5df26a407b288a44bd1d09c53ab08901fe3660426d0744f81ab32c144494af134edeea0f4c915d5844819f5987d9291622cccc7de0691e8eb4a8c
-DIST rustc-1.25.0-src.tar.xz 56108536 BLAKE2B c4a5e56b0e345b5ccde699f68659ac10793670047d2806bdab856d56aa5b960a0df5b947f7c0a7dadfcb7edbe4f9c1a71a94c5f240e91c93296a90d232030645 SHA512 45baaaa47d8b6433f61b1a6f2637d8f4fe013b534a8a94365025dfcf786815c95111b9bd3beb2544ba8587fb4c8b38431765c4d68bc9c19285da4ccf7c7eeda2
-DIST rustc-1.26.2-src.tar.xz 54613640 BLAKE2B f361b7a0ed40ccb026750b4a70b99931f1abf52024e907b588e339902de2fbbd15501d237ac048d0537005834b0a2f49935f654a8c75d40ed95c65894f611481 SHA512 a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
-DIST rustc-1.27.0-src.tar.xz 55455772 BLAKE2B 5c1b26a3e8c6e45aaa43b3ccb5819089cf03c32807ac1adc46ec4f9ff8cf803ec444587ccb737b5d701c4ef5fa634fc4c89de3d71e6202b64ec125f986e54ffd SHA512 b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
diff --git a/dev-lang/rust/files/1.25.0/0001-Require-static-native-libraries-when-linking-static-.patch b/dev-lang/rust/files/1.25.0/0001-Require-static-native-libraries-when-linking-static-.patch
deleted file mode 100644
index d307a95..0000000
--- a/dev-lang/rust/files/1.25.0/0001-Require-static-native-libraries-when-linking-static-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9da9c2f708e0de229a22a2fa8caf34d4c1d6346b Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Fri, 8 Sep 2017 00:05:18 -0500
-Subject: [PATCH 1/8] Require static native libraries when linking static
- executables
-
----
- src/librustc_trans/back/link.rs | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 87464ab0d0..395ee2a03b 100644
---- a/src/librustc_trans/back/link.rs
-+++ b/src/librustc_trans/back/link.rs
-@@ -1329,8 +1329,8 @@ fn add_upstream_rust_crates(cmd: &mut Linker,
- }
- }
-
--// Link in all of our upstream crates' native dependencies. Remember that
--// all of these upstream native dependencies are all non-static
-+// Link in all of our upstream crates' native dependencies. Remember that when
-+// linking libraries, these upstream native dependencies are all non-static
- // dependencies. We've got two cases then:
- //
- // 1. The upstream crate is an rlib. In this case we *must* link in the
-@@ -1370,7 +1370,14 @@ fn add_upstream_native_libraries(cmd: &mut Linker,
- continue
- }
- match lib.kind {
-- NativeLibraryKind::NativeUnknown => cmd.link_dylib(&lib.name.as_str()),
-+ NativeLibraryKind::NativeUnknown => {
-+ // When creating executables, match library linkage to that of the executable.
-+ if crate_type == config::CrateTypeExecutable && sess.crt_static() {
-+ cmd.link_staticlib(&lib.name.as_str())
-+ } else {
-+ cmd.link_dylib(&lib.name.as_str())
-+ }
-+ },
- NativeLibraryKind::NativeFramework => cmd.link_framework(&lib.name.as_str()),
- NativeLibraryKind::NativeStaticNobundle => {
- // Link "static-nobundle" native libs only if the crate they originate from
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/dev-lang/rust/files/1.25.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
deleted file mode 100644
index 6b50eda..0000000
--- a/dev-lang/rust/files/1.25.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ /dev/null
@@ -1,416 +0,0 @@
-From 618ef1bcd4db1c556d482ee3b4292a3746542e57 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Fri, 8 Sep 2017 22:11:14 -0500
-Subject: [PATCH 2/8] Remove -nostdlib and musl_root from musl targets
-
----
- config.toml.example | 6 -----
- src/bootstrap/bin/rustc.rs | 10 -------
- src/bootstrap/cc_detect.rs | 27 +++----------------
- src/bootstrap/compile.rs | 31 ----------------------
- src/bootstrap/config.rs | 7 -----
- src/bootstrap/configure.py | 20 --------------
- src/bootstrap/lib.rs | 8 ------
- src/bootstrap/sanity.rs | 30 +--------------------
- .../docker/dist-i586-gnu-i586-i686-musl/Dockerfile | 2 --
- src/ci/docker/dist-various-1/Dockerfile | 6 -----
- src/ci/docker/dist-x86_64-musl/Dockerfile | 1 -
- src/librustc_back/target/linux_musl_base.rs | 15 -----------
- 12 files changed, 4 insertions(+), 159 deletions(-)
-
-diff --git a/config.toml.example b/config.toml.example
-index f153562a53..db08485322 100644
---- a/config.toml.example
-+++ b/config.toml.example
-@@ -372,12 +372,6 @@
- # only use static libraries. If unset, the target's default linkage is used.
- #crt-static = false
-
--# The root location of the MUSL installation directory. The library directory
--# will also need to contain libunwind.a for an unwinding implementation. Note
--# that this option only makes sense for MUSL targets that produce statically
--# linked binaries
--#musl-root = "..."
--
- # Used in testing for configuring where the QEMU images are located, you
- # probably don't want to use this.
- #qemu-rootfs = "..."
-diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
-index 55d104b182..afd28c1b66 100644
---- a/src/bootstrap/bin/rustc.rs
-+++ b/src/bootstrap/bin/rustc.rs
-@@ -30,7 +30,6 @@
- extern crate bootstrap;
-
- use std::env;
--use std::ffi::OsString;
- use std::str::FromStr;
- use std::path::PathBuf;
- use std::process::{Command, ExitStatus};
-@@ -111,15 +110,6 @@ fn main() {
- cmd.arg("-Cprefer-dynamic");
- }
-
-- // Help the libc crate compile by assisting it in finding the MUSL
-- // native libraries.
-- if let Some(s) = env::var_os("MUSL_ROOT") {
-- let mut root = OsString::from("native=");
-- root.push(&s);
-- root.push("/lib");
-- cmd.arg("-L").arg(&root);
-- }
--
- // Override linker if necessary.
- if let Ok(target_linker) = env::var("RUSTC_TARGET_LINKER") {
- cmd.arg(format!("-Clinker={}", target_linker));
-diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index e531fdaf29..3f49a2cfec 100644
---- a/src/bootstrap/cc_detect.rs
-+++ b/src/bootstrap/cc_detect.rs
-@@ -84,7 +84,7 @@ pub fn find(build: &mut Build) {
- if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
- cfg.compiler(cc);
- } else {
-- set_compiler(&mut cfg, Language::C, target, config, build);
-+ set_compiler(&mut cfg, Language::C, target, config);
- }
-
- let compiler = cfg.get_compiler();
-@@ -112,7 +112,7 @@ pub fn find(build: &mut Build) {
- if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) {
- cfg.compiler(cxx);
- } else {
-- set_compiler(&mut cfg, Language::CPlusPlus, host, config, build);
-+ set_compiler(&mut cfg, Language::CPlusPlus, host, config);
- }
- let compiler = cfg.get_compiler();
- build.verbose(&format!("CXX_{} = {:?}", host, compiler.path()));
-@@ -123,8 +123,7 @@ pub fn find(build: &mut Build) {
- fn set_compiler(cfg: &mut cc::Build,
- compiler: Language,
- target: Interned<String>,
-- config: Option<&Target>,
-- build: &Build) {
-+ config: Option<&Target>) {
- match &*target {
- // When compiling for android we may have the NDK configured in the
- // config.toml in which case we look there. Otherwise the default
-@@ -161,26 +160,6 @@ fn set_compiler(cfg: &mut cc::Build,
- }
- }
-
-- "mips-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mips-linux-musl-gcc");
-- }
-- }
-- "mipsel-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mipsel-linux-musl-gcc");
-- }
-- }
--
-- t if t.contains("musl") => {
-- if let Some(root) = build.musl_root(target) {
-- let guess = root.join("bin/musl-gcc");
-- if guess.exists() {
-- cfg.compiler(guess);
-- }
-- }
-- }
--
- _ => {}
- }
- }
-diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index c85b04ddc0..c01c2341dd 100644
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -78,13 +78,6 @@ impl Step for Std {
- });
- println!("Uplifting stage1 std ({} -> {})", from.host, target);
-
-- // Even if we're not building std this stage, the new sysroot must
-- // still contain the musl startup objects.
-- if target.contains("musl") {
-- let libdir = builder.sysroot_libdir(compiler, target);
-- copy_musl_third_party_objects(build, target, &libdir);
-- }
--
- builder.ensure(StdLink {
- compiler: from,
- target_compiler: compiler,
-@@ -97,11 +90,6 @@ impl Step for Std {
- println!("Building stage{} std artifacts ({} -> {})", compiler.stage,
- &compiler.host, target);
-
-- if target.contains("musl") {
-- let libdir = builder.sysroot_libdir(compiler, target);
-- copy_musl_third_party_objects(build, target, &libdir);
-- }
--
- let out_dir = build.stage_out(compiler, Mode::Libstd);
- build.clear_if_dirty(&out_dir, &builder.rustc(compiler));
- let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "build");
-@@ -119,20 +107,6 @@ impl Step for Std {
- }
- }
-
--/// Copies the crt(1,i,n).o startup objects
--///
--/// Since musl supports fully static linking, we can cross link for it even
--/// with a glibc-targeting toolchain, given we have the appropriate startup
--/// files. As those shipped with glibc won't work, copy the ones provided by
--/// musl so we have them on linux-gnu hosts.
--fn copy_musl_third_party_objects(build: &Build,
-- target: Interned<String>,
-- into: &Path) {
-- for &obj in &["crt1.o", "crti.o", "crtn.o"] {
-- copy(&build.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj));
-- }
--}
--
- /// Configure cargo to compile the standard library, adding appropriate env vars
- /// and such.
- pub fn std_cargo(build: &Build,
-@@ -174,11 +148,6 @@ pub fn std_cargo(build: &Build,
- cargo.env("JEMALLOC_OVERRIDE", jemalloc);
- }
- }
-- if target.contains("musl") {
-- if let Some(p) = build.musl_root(target) {
-- cargo.env("MUSL_ROOT", p);
-- }
-- }
- }
-
- #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index f3810ac869..87f4fb0fae 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -119,8 +119,6 @@ pub struct Config {
- pub test_miri: bool,
- pub save_toolstates: Option<PathBuf>,
-
-- // Fallback musl-root for all targets
-- pub musl_root: Option<PathBuf>,
- pub prefix: Option<PathBuf>,
- pub sysconfdir: Option<PathBuf>,
- pub datadir: Option<PathBuf>,
-@@ -152,7 +150,6 @@ pub struct Target {
- pub linker: Option<PathBuf>,
- pub ndk: Option<PathBuf>,
- pub crt_static: Option<bool>,
-- pub musl_root: Option<PathBuf>,
- pub qemu_rootfs: Option<PathBuf>,
- }
-
-@@ -277,7 +274,6 @@ struct Rust {
- backtrace: Option<bool>,
- default_linker: Option<String>,
- channel: Option<String>,
-- musl_root: Option<String>,
- rpath: Option<bool>,
- optimize_tests: Option<bool>,
- debuginfo_tests: Option<bool>,
-@@ -304,7 +300,6 @@ struct TomlTarget {
- linker: Option<String>,
- android_ndk: Option<String>,
- crt_static: Option<bool>,
-- musl_root: Option<String>,
- qemu_rootfs: Option<String>,
- }
-
-@@ -479,7 +474,6 @@ impl Config {
- set(&mut config.wasm_syscall, rust.wasm_syscall);
- config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);
- config.rustc_default_linker = rust.default_linker.clone();
-- config.musl_root = rust.musl_root.clone().map(PathBuf::from);
- config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
-
- if let Some(ref backends) = rust.codegen_backends {
-@@ -513,7 +507,6 @@ impl Config {
- target.ar = cfg.ar.clone().map(PathBuf::from);
- target.linker = cfg.linker.clone().map(PathBuf::from);
- target.crt_static = cfg.crt_static.clone();
-- target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
- target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
-
- config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
-diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 99a3ee4e4c..5357d3a3fb 100755
---- a/src/bootstrap/configure.py
-+++ b/src/bootstrap/configure.py
-@@ -106,26 +106,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
- "aarch64-linux-android NDK standalone path")
- v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
- "x86_64-linux-android NDK standalone path")
--v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
-- "MUSL root installation directory (deprecated)")
--v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",
-- "x86_64-unknown-linux-musl install directory")
--v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root",
-- "i586-unknown-linux-musl install directory")
--v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root",
-- "i686-unknown-linux-musl install directory")
--v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
-- "arm-unknown-linux-musleabi install directory")
--v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
-- "arm-unknown-linux-musleabihf install directory")
--v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
-- "armv7-unknown-linux-musleabihf install directory")
--v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
-- "aarch64-unknown-linux-musl install directory")
--v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root",
-- "mips-unknown-linux-musl install directory")
--v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
-- "mipsel-unknown-linux-musl install directory")
- v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
- "rootfs in qemu testing, you probably don't want to use this")
- v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
-diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index afd740ce54..428f3ad2ba 100644
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
-@@ -700,14 +700,6 @@ impl Build {
- }
- }
-
-- /// Returns the "musl root" for this `target`, if defined
-- fn musl_root(&self, target: Interned<String>) -> Option<&Path> {
-- self.config.target_config.get(&target)
-- .and_then(|t| t.musl_root.as_ref())
-- .or(self.config.musl_root.as_ref())
-- .map(|p| &**p)
-- }
--
- /// Returns whether the target will be tested using the `remote-test-client`
- /// and `remote-test-server` binaries.
- fn remote_tested(&self, target: Interned<String>) -> bool {
-diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index 5184cca653..defc85e93f 100644
---- a/src/bootstrap/sanity.rs
-+++ b/src/bootstrap/sanity.rs
-@@ -21,7 +21,7 @@
- use std::collections::HashMap;
- use std::env;
- use std::ffi::{OsString, OsStr};
--use std::fs::{self, File};
-+use std::fs::File;
- use std::io::Read;
- use std::path::PathBuf;
- use std::process::Command;
-@@ -169,34 +169,6 @@ pub fn check(build: &mut Build) {
- panic!("the iOS target is only supported on macOS");
- }
-
-- // Make sure musl-root is valid
-- if target.contains("musl") {
-- // If this is a native target (host is also musl) and no musl-root is given,
-- // fall back to the system toolchain in /usr before giving up
-- if build.musl_root(*target).is_none() && build.config.build == *target {
-- let target = build.config.target_config.entry(target.clone())
-- .or_insert(Default::default());
-- target.musl_root = Some("/usr".into());
-- }
-- match build.musl_root(*target) {
-- Some(root) => {
-- if fs::metadata(root.join("lib/libc.a")).is_err() {
-- panic!("couldn't find libc.a in musl dir: {}",
-- root.join("lib").display());
-- }
-- if fs::metadata(root.join("lib/libunwind.a")).is_err() {
-- panic!("couldn't find libunwind.a in musl dir: {}",
-- root.join("lib").display());
-- }
-- }
-- None => {
-- panic!("when targeting MUSL either the rust.musl-root \
-- option or the target.$TARGET.musl-root option must \
-- be specified in config.toml")
-- }
-- }
-- }
--
- if target.contains("msvc") {
- // There are three builds of cmake on windows: MSVC, MinGW, and
- // Cygwin. The Cygwin build does not have generators for Visual
-diff --git a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-index 035846b4f6..5eab5933c5 100644
---- a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-+++ b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-@@ -31,8 +31,6 @@ RUN sh /scripts/sccache.sh
-
- ENV RUST_CONFIGURE_ARGS \
- --target=i686-unknown-linux-musl,i586-unknown-linux-gnu \
-- --musl-root-i586=/musl-i586 \
-- --musl-root-i686=/musl-i686 \
- --enable-extended
-
- # Newer binutils broke things on some vms/distros (i.e., linking against
-diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile
-index c83f101d0a..0b9ec9de86 100644
---- a/src/ci/docker/dist-various-1/Dockerfile
-+++ b/src/ci/docker/dist-various-1/Dockerfile
-@@ -90,12 +90,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
-
- ENV RUST_CONFIGURE_ARGS \
- --target=$TARGETS \
-- --musl-root-arm=/musl-arm \
-- --musl-root-armhf=/musl-armhf \
-- --musl-root-armv7=/musl-armv7 \
-- --musl-root-aarch64=/musl-aarch64 \
-- --musl-root-mips=/musl-mips \
-- --musl-root-mipsel=/musl-mipsel \
- --enable-emscripten
-
- ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
-diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile
-index c1061309c3..2fb9481479 100644
---- a/src/ci/docker/dist-x86_64-musl/Dockerfile
-+++ b/src/ci/docker/dist-x86_64-musl/Dockerfile
-@@ -31,7 +31,6 @@ RUN sh /scripts/sccache.sh
-
- ENV RUST_CONFIGURE_ARGS \
- --target=x86_64-unknown-linux-musl \
-- --musl-root-x86_64=/musl-x86_64 \
- --enable-extended
-
- # Newer binutils broke things on some vms/distros (i.e., linking against
-diff --git a/src/librustc_back/target/linux_musl_base.rs b/src/librustc_back/target/linux_musl_base.rs
-index 6e5e139715..d99cb55cc5 100644
---- a/src/librustc_back/target/linux_musl_base.rs
-+++ b/src/librustc_back/target/linux_musl_base.rs
-@@ -14,10 +14,6 @@ use target::TargetOptions;
- pub fn opts() -> TargetOptions {
- let mut base = super::linux_base::opts();
-
-- // Make sure that the linker/gcc really don't pull in anything, including
-- // default objects, libs, etc.
-- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-nostdlib".to_string());
--
- // At least when this was tested, the linker would not add the
- // `GNU_EH_FRAME` program header to executables generated, which is required
- // when unwinding to locate the unwinding information. I'm not sure why this
-@@ -49,17 +45,6 @@ pub fn opts() -> TargetOptions {
- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,-(".to_string());
- base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-Wl,-)".to_string()]);
-
-- // When generating a statically linked executable there's generally some
-- // small setup needed which is listed in these files. These are provided by
-- // a musl toolchain and are linked by default by the `musl-gcc` script. Note
-- // that `gcc` also does this by default, it just uses some different files.
-- //
-- // Each target directory for musl has these object files included in it so
-- // they'll be included from there.
-- base.pre_link_objects_exe.push("crt1.o".to_string());
-- base.pre_link_objects_exe.push("crti.o".to_string());
-- base.post_link_objects.push("crtn.o".to_string());
--
- // These targets statically link libc by default
- base.crt_static_default = true;
- // These targets allow the user to choose between static and dynamic linking.
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch b/dev-lang/rust/files/1.25.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
deleted file mode 100644
index 26ecebf..0000000
--- a/dev-lang/rust/files/1.25.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b02bdc170e02f3ee226728ddd912b5d4171677d2 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 30 Nov 2017 08:15:51 -0600
-Subject: [PATCH 3/8] Switch musl targets to link dynamically by default
-
----
- src/librustc_back/target/linux_musl_base.rs | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/librustc_back/target/linux_musl_base.rs b/src/librustc_back/target/linux_musl_base.rs
-index d99cb55cc5..bb786bf0f3 100644
---- a/src/librustc_back/target/linux_musl_base.rs
-+++ b/src/librustc_back/target/linux_musl_base.rs
-@@ -45,8 +45,6 @@ pub fn opts() -> TargetOptions {
- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,-(".to_string());
- base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-Wl,-)".to_string()]);
-
-- // These targets statically link libc by default
-- base.crt_static_default = true;
- // These targets allow the user to choose between static and dynamic linking.
- base.crt_static_respected = true;
-
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/dev-lang/rust/files/1.25.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch
deleted file mode 100644
index 7e992b5..0000000
--- a/dev-lang/rust/files/1.25.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a508441f79b41f3de9bc5fd03bcc7c1fce205efb Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 9 Sep 2017 00:14:16 -0500
-Subject: [PATCH 4/8] Prefer libgcc_eh over libunwind for musl
-
----
- src/libunwind/lib.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
-index 5347c78121..e9be63f282 100644
---- a/src/libunwind/lib.rs
-+++ b/src/libunwind/lib.rs
-@@ -36,6 +36,6 @@ cfg_if! {
- }
-
- #[cfg(target_env = "musl")]
--#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
-+#[link(name = "gcc_eh", cfg(target_feature = "crt-static"))]
- #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
- extern {}
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0005-Fix-LLVM-build.patch b/dev-lang/rust/files/1.25.0/0005-Fix-LLVM-build.patch
deleted file mode 100644
index ddef113..0000000
--- a/dev-lang/rust/files/1.25.0/0005-Fix-LLVM-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2dca67022c550b8ea69623fcaa04bee10112ea77 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Fri, 8 Sep 2017 00:04:29 -0500
-Subject: [PATCH 5/8] Fix LLVM build
-
----
- src/bootstrap/lib.rs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 428f3ad2ba..a3aaa3c57f 100644
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
-@@ -642,7 +642,8 @@ impl Build {
- // cc-rs because the build scripts will determine that for themselves.
- let mut base = self.cc[&target].args().iter()
- .map(|s| s.to_string_lossy().into_owned())
-- .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
-+ .filter(|s| !s.starts_with("-O") && !s.starts_with("/O")
-+ && !s.starts_with("-static"))
- .collect::<Vec<_>>();
-
- // If we're compiling on macOS then we add a few unconditional flags
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0006-Fix-rustdoc-for-cross-targets.patch b/dev-lang/rust/files/1.25.0/0006-Fix-rustdoc-for-cross-targets.patch
deleted file mode 100644
index af86047..0000000
--- a/dev-lang/rust/files/1.25.0/0006-Fix-rustdoc-for-cross-targets.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7fceddea2b70f3d0e898c8be820cd2d7fb4dfc32 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 2 Dec 2017 17:25:44 -0600
-Subject: [PATCH 6/8] Fix rustdoc for cross targets
-
-musl can't handle wrong-architecture libraries in LD_LIBRARY_PATH.
----
- src/bootstrap/bin/rustdoc.rs | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
-index 389b504c64..b7b77eb431 100644
---- a/src/bootstrap/bin/rustdoc.rs
-+++ b/src/bootstrap/bin/rustdoc.rs
-@@ -34,9 +34,6 @@ fn main() {
- Err(_) => 0,
- };
-
-- let mut dylib_path = bootstrap::util::dylib_path();
-- dylib_path.insert(0, PathBuf::from(libdir));
--
- let mut cmd = Command::new(rustdoc);
- cmd.args(&args)
- .arg("--cfg")
-@@ -46,7 +43,7 @@ fn main() {
- .arg("--sysroot")
- .arg(sysroot)
- .env(bootstrap::util::dylib_path_var(),
-- env::join_paths(&dylib_path).unwrap());
-+ PathBuf::from(libdir));
-
- // Force all crates compiled by this compiler to (a) be unstable and (b)
- // allow the `rustc_private` feature to link to other unstable crates
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0007-Add-openssl-configuration-for-musl-targets.patch b/dev-lang/rust/files/1.25.0/0007-Add-openssl-configuration-for-musl-targets.patch
deleted file mode 100644
index 8ee65a9..0000000
--- a/dev-lang/rust/files/1.25.0/0007-Add-openssl-configuration-for-musl-targets.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1e9d653ccb0da803b1f30ded65c2dd727c89100c Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Mon, 11 Sep 2017 11:21:56 -0500
-Subject: [PATCH 7/8] Add openssl configuration for musl targets
-
----
- src/bootstrap/native.rs | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
-index 3c91cf3ecc..198ac36789 100644
---- a/src/bootstrap/native.rs
-+++ b/src/bootstrap/native.rs
-@@ -457,8 +457,11 @@ impl Step for Openssl {
- "arm-linux-androideabi" => "android",
- "arm-unknown-linux-gnueabi" => "linux-armv4",
- "arm-unknown-linux-gnueabihf" => "linux-armv4",
-- "armv7-linux-androideabi" => "android-armv7",
-+ "arm-unknown-linux-musleabi" => "linux-armv4",
-+ "arm-unknown-linux-musleabihf" => "linux-armv4",
-+ "armv7-linux-androideabi" => "android-armv4",
- "armv7-unknown-linux-gnueabihf" => "linux-armv4",
-+ "armv7-unknown-linux-musleabihf" => "linux-armv4",
- "i586-unknown-linux-gnu" => "linux-elf",
- "i586-unknown-linux-musl" => "linux-elf",
- "i686-apple-darwin" => "darwin-i386-cc",
-@@ -468,9 +471,11 @@ impl Step for Openssl {
- "i686-unknown-linux-musl" => "linux-elf",
- "i686-unknown-netbsd" => "BSD-x86-elf",
- "mips-unknown-linux-gnu" => "linux-mips32",
-+ "mips-unknown-linux-musl" => "linux-mips32",
- "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
- "mips64el-unknown-linux-gnuabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
-+ "mipsel-unknown-linux-musl" => "linux-mips32",
- "powerpc-unknown-linux-gnu" => "linux-ppc",
- "powerpc64-unknown-linux-gnu" => "linux-ppc64",
- "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/dev-lang/rust/files/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
deleted file mode 100644
index 5a69455..0000000
--- a/dev-lang/rust/files/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d1cc6048465f4cc7a06495b424693aa0c27f3137 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Wed, 10 Jan 2018 13:36:41 -0600
-Subject: [PATCH 8/8] Don't pass CFLAGS to the C++ compiler
-
----
- src/bootstrap/builder.rs | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index fcb78c479f..55848d6971 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -689,7 +689,7 @@ impl<'a> Builder<'a> {
-
- let cflags = self.cflags(target).join(" ");
- cargo.env(format!("CFLAGS_{}", target), cflags.clone())
-- .env("CFLAGS", cflags.clone());
-+ .env("CFLAGS", cflags);
-
- if let Some(ar) = self.ar(target) {
- let ranlib = format!("{} s", ar.display());
-@@ -701,9 +701,7 @@ impl<'a> Builder<'a> {
-
- if let Ok(cxx) = self.cxx(target) {
- cargo.env(format!("CXX_{}", target), cxx)
-- .env("CXX", cxx)
-- .env(format!("CXXFLAGS_{}", target), cflags.clone())
-- .env("CXXFLAGS", cflags);
-+ .env("CXX", cxx);
- }
- }
-
---
-2.16.1
-
diff --git a/dev-lang/rust/files/1.25.0/0009-liblibc.patch b/dev-lang/rust/files/1.25.0/0009-liblibc.patch
deleted file mode 100644
index f7867ac..0000000
--- a/dev-lang/rust/files/1.25.0/0009-liblibc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/liblibc/src/unix/mod.rs b/src/liblibc/src/unix/mod.rs
-index 134f44c5a..7e5c9b6c5 100644
---- a/src/liblibc/src/unix/mod.rs
-+++ b/src/liblibc/src/unix/mod.rs
-@@ -277,11 +277,7 @@ cfg_if! {
- // cargo build, don't pull in anything extra as the libstd dep
- // already pulls in all libs.
- } else if #[cfg(target_env = "musl")] {
-- #[cfg_attr(feature = "stdbuild",
-- link(name = "c", kind = "static",
-- cfg(target_feature = "crt-static")))]
-- #[cfg_attr(feature = "stdbuild",
-- link(name = "c", cfg(not(target_feature = "crt-static"))))]
-+ #[link(name = "c")]
- extern {}
- } else if #[cfg(target_os = "emscripten")] {
- #[link(name = "c")]
diff --git a/dev-lang/rust/files/1.25.0/0010-llvm.patch b/dev-lang/rust/files/1.25.0/0010-llvm.patch
deleted file mode 100644
index 3f9f409..0000000
--- a/dev-lang/rust/files/1.25.0/0010-llvm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/llvm/include/llvm/Analysis/TargetLibraryInfo.def b/src/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-index 579d23004d1..6cd9d2722fb 100644
---- a/src/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-+++ b/src/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-@@ -27,6 +27,15 @@
- #define TLI_DEFINE_STRING_INTERNAL(string_repr) string_repr,
- #endif
-
-+// avoid name conflicts with musl-libc
-+#undef fopen64
-+#undef fseeko64
-+#undef ftello64
-+#undef fstat64
-+#undef lstat64
-+#undef stat64
-+#undef tmpfile64
-+
- /// void *new(unsigned int);
- TLI_DEFINE_ENUM_INTERNAL(msvc_new_int)
- TLI_DEFINE_STRING_INTERNAL("??2@YAPAXI@Z")
diff --git a/dev-lang/rust/files/1.26.2/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/dev-lang/rust/files/1.26.2/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
deleted file mode 100644
index 53de567..0000000
--- a/dev-lang/rust/files/1.26.2/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -Naur rustc-1.26.2-src.orig/config.toml.example rustc-1.26.2-src/config.toml.example
---- rustc-1.26.2-src.orig/config.toml.example 2018-06-16 11:22:33.396391832 -0700
-+++ rustc-1.26.2-src/config.toml.example 2018-06-16 11:22:53.998391463 -0700
-@@ -385,12 +385,6 @@
- # only use static libraries. If unset, the target's default linkage is used.
- #crt-static = false
-
--# The root location of the MUSL installation directory. The library directory
--# will also need to contain libunwind.a for an unwinding implementation. Note
--# that this option only makes sense for MUSL targets that produce statically
--# linked binaries
--#musl-root = "..."
--
- # Used in testing for configuring where the QEMU images are located, you
- # probably don't want to use this.
- #qemu-rootfs = "..."
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/bin/rustc.rs rustc-1.26.2-src/src/bootstrap/bin/rustc.rs
---- rustc-1.26.2-src.orig/src/bootstrap/bin/rustc.rs 2018-06-16 11:22:29.172391908 -0700
-+++ rustc-1.26.2-src/src/bootstrap/bin/rustc.rs 2018-06-16 11:23:27.848390857 -0700
-@@ -30,7 +30,6 @@
- extern crate bootstrap;
-
- use std::env;
--use std::ffi::OsString;
- use std::io;
- use std::path::PathBuf;
- use std::process::Command;
-@@ -119,15 +118,6 @@
- cmd.arg("-Cprefer-dynamic");
- }
-
-- // Help the libc crate compile by assisting it in finding the MUSL
-- // native libraries.
-- if let Some(s) = env::var_os("MUSL_ROOT") {
-- let mut root = OsString::from("native=");
-- root.push(&s);
-- root.push("/lib");
-- cmd.arg("-L").arg(&root);
-- }
--
- // Override linker if necessary.
- if let Ok(target_linker) = env::var("RUSTC_TARGET_LINKER") {
- cmd.arg(format!("-Clinker={}", target_linker));
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/cc_detect.rs rustc-1.26.2-src/src/bootstrap/cc_detect.rs
---- rustc-1.26.2-src.orig/src/bootstrap/cc_detect.rs 2018-06-16 11:22:29.173391907 -0700
-+++ rustc-1.26.2-src/src/bootstrap/cc_detect.rs 2018-06-16 11:24:29.726389749 -0700
-@@ -87,7 +87,7 @@
- if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
- cfg.compiler(cc);
- } else {
-- set_compiler(&mut cfg, Language::C, target, config, build);
-+ set_compiler(&mut cfg, Language::C, target, config);
- }
-
- let compiler = cfg.get_compiler();
-@@ -115,7 +115,7 @@
- if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) {
- cfg.compiler(cxx);
- } else {
-- set_compiler(&mut cfg, Language::CPlusPlus, host, config, build);
-+ set_compiler(&mut cfg, Language::CPlusPlus, host, config);
- }
- let compiler = cfg.get_compiler();
- build.verbose(&format!("CXX_{} = {:?}", host, compiler.path()));
-@@ -126,8 +126,7 @@
- fn set_compiler(cfg: &mut cc::Build,
- compiler: Language,
- target: Interned<String>,
-- config: Option<&Target>,
-- build: &Build) {
-+ config: Option<&Target>) {
- match &*target {
- // When compiling for android we may have the NDK configured in the
- // config.toml in which case we look there. Otherwise the default
-@@ -164,26 +163,6 @@
- }
- }
-
-- "mips-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mips-linux-musl-gcc");
-- }
-- }
-- "mipsel-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mipsel-linux-musl-gcc");
-- }
-- }
--
-- t if t.contains("musl") => {
-- if let Some(root) = build.musl_root(target) {
-- let guess = root.join("bin/musl-gcc");
-- if guess.exists() {
-- cfg.compiler(guess);
-- }
-- }
-- }
--
- _ => {}
- }
- }
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/compile.rs rustc-1.26.2-src/src/bootstrap/compile.rs
---- rustc-1.26.2-src.orig/src/bootstrap/compile.rs 2018-06-16 11:22:29.173391907 -0700
-+++ rustc-1.26.2-src/src/bootstrap/compile.rs 2018-06-16 11:25:15.744388925 -0700
-@@ -79,13 +79,6 @@
- });
- println!("Uplifting stage1 std ({} -> {})", from.host, target);
-
-- // Even if we're not building std this stage, the new sysroot must
-- // still contain the musl startup objects.
-- if target.contains("musl") {
-- let libdir = builder.sysroot_libdir(compiler, target);
-- copy_musl_third_party_objects(build, target, &libdir);
-- }
--
- builder.ensure(StdLink {
- compiler: from,
- target_compiler: compiler,
-@@ -94,11 +87,6 @@
- return;
- }
-
-- if target.contains("musl") {
-- let libdir = builder.sysroot_libdir(compiler, target);
-- copy_musl_third_party_objects(build, target, &libdir);
-- }
--
- let out_dir = build.cargo_out(compiler, Mode::Libstd, target);
- build.clear_if_dirty(&out_dir, &builder.rustc(compiler));
- let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "build");
-@@ -120,20 +108,6 @@
- }
- }
-
--/// Copies the crt(1,i,n).o startup objects
--///
--/// Since musl supports fully static linking, we can cross link for it even
--/// with a glibc-targeting toolchain, given we have the appropriate startup
--/// files. As those shipped with glibc won't work, copy the ones provided by
--/// musl so we have them on linux-gnu hosts.
--fn copy_musl_third_party_objects(build: &Build,
-- target: Interned<String>,
-- into: &Path) {
-- for &obj in &["crt1.o", "crti.o", "crtn.o"] {
-- copy(&build.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj));
-- }
--}
--
- /// Configure cargo to compile the standard library, adding appropriate env vars
- /// and such.
- pub fn std_cargo(build: &Builder,
-@@ -179,11 +153,6 @@
- cargo.env("JEMALLOC_OVERRIDE", jemalloc);
- }
- }
-- if target.contains("musl") {
-- if let Some(p) = build.musl_root(target) {
-- cargo.env("MUSL_ROOT", p);
-- }
-- }
- }
-
- #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/config.rs rustc-1.26.2-src/src/bootstrap/config.rs
---- rustc-1.26.2-src.orig/src/bootstrap/config.rs 2018-06-16 11:22:29.173391907 -0700
-+++ rustc-1.26.2-src/src/bootstrap/config.rs 2018-06-16 11:25:42.883388439 -0700
-@@ -124,8 +124,6 @@
- pub save_toolstates: Option<PathBuf>,
- pub print_step_timings: bool,
-
-- // Fallback musl-root for all targets
-- pub musl_root: Option<PathBuf>,
- pub prefix: Option<PathBuf>,
- pub sysconfdir: Option<PathBuf>,
- pub datadir: Option<PathBuf>,
-@@ -157,7 +155,6 @@
- pub linker: Option<PathBuf>,
- pub ndk: Option<PathBuf>,
- pub crt_static: Option<bool>,
-- pub musl_root: Option<PathBuf>,
- pub qemu_rootfs: Option<PathBuf>,
- }
-
-@@ -283,7 +280,6 @@
- backtrace: Option<bool>,
- default_linker: Option<String>,
- channel: Option<String>,
-- musl_root: Option<String>,
- rpath: Option<bool>,
- optimize_tests: Option<bool>,
- debuginfo_tests: Option<bool>,
-@@ -312,7 +308,6 @@
- linker: Option<String>,
- android_ndk: Option<String>,
- crt_static: Option<bool>,
-- musl_root: Option<String>,
- qemu_rootfs: Option<String>,
- }
-
-@@ -491,7 +486,6 @@
- set(&mut config.lld_enabled, rust.lld);
- config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);
- config.rustc_default_linker = rust.default_linker.clone();
-- config.musl_root = rust.musl_root.clone().map(PathBuf::from);
- config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
-
- if let Some(ref backends) = rust.codegen_backends {
-@@ -527,7 +521,6 @@
- target.ar = cfg.ar.clone().map(PathBuf::from);
- target.linker = cfg.linker.clone().map(PathBuf::from);
- target.crt_static = cfg.crt_static.clone();
-- target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
- target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
-
- config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/configure.py rustc-1.26.2-src/src/bootstrap/configure.py
---- rustc-1.26.2-src.orig/src/bootstrap/configure.py 2018-06-16 11:22:29.174391907 -0700
-+++ rustc-1.26.2-src/src/bootstrap/configure.py 2018-06-16 11:26:09.751387957 -0700
-@@ -107,26 +107,6 @@
- "aarch64-linux-android NDK standalone path")
- v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
- "x86_64-linux-android NDK standalone path")
--v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
-- "MUSL root installation directory (deprecated)")
--v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",
-- "x86_64-unknown-linux-musl install directory")
--v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root",
-- "i586-unknown-linux-musl install directory")
--v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root",
-- "i686-unknown-linux-musl install directory")
--v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
-- "arm-unknown-linux-musleabi install directory")
--v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
-- "arm-unknown-linux-musleabihf install directory")
--v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
-- "armv7-unknown-linux-musleabihf install directory")
--v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
-- "aarch64-unknown-linux-musl install directory")
--v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root",
-- "mips-unknown-linux-musl install directory")
--v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
-- "mipsel-unknown-linux-musl install directory")
- v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
- "rootfs in qemu testing, you probably don't want to use this")
- v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/lib.rs rustc-1.26.2-src/src/bootstrap/lib.rs
---- rustc-1.26.2-src.orig/src/bootstrap/lib.rs 2018-06-16 11:22:29.173391907 -0700
-+++ rustc-1.26.2-src/src/bootstrap/lib.rs 2018-06-16 11:26:19.201387788 -0700
-@@ -701,14 +701,6 @@
- }
- }
-
-- /// Returns the "musl root" for this `target`, if defined
-- fn musl_root(&self, target: Interned<String>) -> Option<&Path> {
-- self.config.target_config.get(&target)
-- .and_then(|t| t.musl_root.as_ref())
-- .or(self.config.musl_root.as_ref())
-- .map(|p| &**p)
-- }
--
- /// Returns whether the target will be tested using the `remote-test-client`
- /// and `remote-test-server` binaries.
- fn remote_tested(&self, target: Interned<String>) -> bool {
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/sanity.rs rustc-1.26.2-src/src/bootstrap/sanity.rs
---- rustc-1.26.2-src.orig/src/bootstrap/sanity.rs 2018-06-16 11:22:29.174391907 -0700
-+++ rustc-1.26.2-src/src/bootstrap/sanity.rs 2018-06-16 11:26:47.473387282 -0700
-@@ -21,7 +21,7 @@
- use std::collections::HashMap;
- use std::env;
- use std::ffi::{OsString, OsStr};
--use std::fs::{self, File};
-+use std::fs::File;
- use std::io::Read;
- use std::path::PathBuf;
- use std::process::Command;
-@@ -169,34 +169,6 @@
- panic!("the iOS target is only supported on macOS");
- }
-
-- // Make sure musl-root is valid
-- if target.contains("musl") {
-- // If this is a native target (host is also musl) and no musl-root is given,
-- // fall back to the system toolchain in /usr before giving up
-- if build.musl_root(*target).is_none() && build.config.build == *target {
-- let target = build.config.target_config.entry(target.clone())
-- .or_insert(Default::default());
-- target.musl_root = Some("/usr".into());
-- }
-- match build.musl_root(*target) {
-- Some(root) => {
-- if fs::metadata(root.join("lib/libc.a")).is_err() {
-- panic!("couldn't find libc.a in musl dir: {}",
-- root.join("lib").display());
-- }
-- if fs::metadata(root.join("lib/libunwind.a")).is_err() {
-- panic!("couldn't find libunwind.a in musl dir: {}",
-- root.join("lib").display());
-- }
-- }
-- None => {
-- panic!("when targeting MUSL either the rust.musl-root \
-- option or the target.$TARGET.musl-root option must \
-- be specified in config.toml")
-- }
-- }
-- }
--
- if target.contains("msvc") {
- // There are three builds of cmake on windows: MSVC, MinGW, and
- // Cygwin. The Cygwin build does not have generators for Visual
-diff -Naur rustc-1.26.2-src.orig/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile rustc-1.26.2-src/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
---- rustc-1.26.2-src.orig/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile 2018-06-16 11:22:23.405392011 -0700
-+++ rustc-1.26.2-src/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile 2018-06-16 11:27:03.296386998 -0700
-@@ -30,8 +30,6 @@
- RUN sh /scripts/sccache.sh
-
- ENV RUST_CONFIGURE_ARGS \
-- --musl-root-i586=/musl-i586 \
-- --musl-root-i686=/musl-i686 \
- --enable-extended \
- --disable-docs
-
-diff -Naur rustc-1.26.2-src.orig/src/ci/docker/dist-various-1/Dockerfile rustc-1.26.2-src/src/ci/docker/dist-various-1/Dockerfile
---- rustc-1.26.2-src.orig/src/ci/docker/dist-various-1/Dockerfile 2018-06-16 11:22:23.407392011 -0700
-+++ rustc-1.26.2-src/src/ci/docker/dist-various-1/Dockerfile 2018-06-16 11:27:20.337386693 -0700
-@@ -89,12 +89,6 @@
- CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft"
-
- ENV RUST_CONFIGURE_ARGS \
-- --musl-root-arm=/musl-arm \
-- --musl-root-armhf=/musl-armhf \
-- --musl-root-armv7=/musl-armv7 \
-- --musl-root-aarch64=/musl-aarch64 \
-- --musl-root-mips=/musl-mips \
-- --musl-root-mipsel=/musl-mipsel \
- --enable-emscripten \
- --disable-docs
-
-diff -Naur rustc-1.26.2-src.orig/src/ci/docker/dist-x86_64-musl/Dockerfile rustc-1.26.2-src/src/ci/docker/dist-x86_64-musl/Dockerfile
---- rustc-1.26.2-src.orig/src/ci/docker/dist-x86_64-musl/Dockerfile 2018-06-16 11:22:23.408392011 -0700
-+++ rustc-1.26.2-src/src/ci/docker/dist-x86_64-musl/Dockerfile 2018-06-16 11:27:35.208386427 -0700
-@@ -30,7 +30,6 @@
- RUN sh /scripts/sccache.sh
-
- ENV RUST_CONFIGURE_ARGS \
-- --musl-root-x86_64=/musl-x86_64 \
- --enable-extended \
- --disable-docs
-
-diff -Naur rustc-1.26.2-src.orig/src/librustc_back/target/linux_musl_base.rs rustc-1.26.2-src/src/librustc_back/target/linux_musl_base.rs
---- rustc-1.26.2-src.orig/src/librustc_back/target/linux_musl_base.rs 2018-06-16 11:22:29.170391908 -0700
-+++ rustc-1.26.2-src/src/librustc_back/target/linux_musl_base.rs 2018-06-16 11:28:09.763385808 -0700
-@@ -14,10 +14,6 @@
- pub fn opts() -> TargetOptions {
- let mut base = super::linux_base::opts();
-
-- // Make sure that the linker/gcc really don't pull in anything, including
-- // default objects, libs, etc.
-- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-nostdlib".to_string());
--
- // At least when this was tested, the linker would not add the
- // `GNU_EH_FRAME` program header to executables generated, which is required
- // when unwinding to locate the unwinding information. I'm not sure why this
-@@ -49,17 +45,6 @@
- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,-(".to_string());
- base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-Wl,-)".to_string()]);
-
-- // When generating a statically linked executable there's generally some
-- // small setup needed which is listed in these files. These are provided by
-- // a musl toolchain and are linked by default by the `musl-gcc` script. Note
-- // that `gcc` also does this by default, it just uses some different files.
-- //
-- // Each target directory for musl has these object files included in it so
-- // they'll be included from there.
-- base.pre_link_objects_exe.push("crt1.o".to_string());
-- base.pre_link_objects_exe.push("crti.o".to_string());
-- base.post_link_objects.push("crtn.o".to_string());
--
- // These targets statically link libc by default
- base.crt_static_default = true;
- // These targets allow the user to choose between static and dynamic linking.
diff --git a/dev-lang/rust/files/1.26.2/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/dev-lang/rust/files/1.26.2/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
deleted file mode 100644
index 99e992a..0000000
--- a/dev-lang/rust/files/1.26.2/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur rustc-1.26.2-src.orig/src/bootstrap/builder.rs rustc-1.26.2-src/src/bootstrap/builder.rs
---- rustc-1.26.2-src.orig/src/bootstrap/builder.rs 2018-06-16 11:22:29.173391907 -0700
-+++ rustc-1.26.2-src/src/bootstrap/builder.rs 2018-06-16 11:31:32.573382176 -0700
-@@ -709,7 +709,7 @@
-
- let cflags = self.cflags(target).join(" ");
- cargo.env(format!("CFLAGS_{}", target), cflags.clone())
-- .env("CFLAGS", cflags.clone());
-+ .env("CFLAGS", cflags);
-
- if let Some(ar) = self.ar(target) {
- let ranlib = format!("{} s", ar.display());
-@@ -722,9 +722,7 @@
- if let Ok(cxx) = self.cxx(target) {
- let cxx = ccacheify(&cxx);
- cargo.env(format!("CXX_{}", target), &cxx)
-- .env("CXX", &cxx)
-- .env(format!("CXXFLAGS_{}", target), cflags.clone())
-- .env("CXXFLAGS", cflags);
-+ .env("CXX", &cxx);
- }
- }
-
diff --git a/dev-lang/rust/files/1.27.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/dev-lang/rust/files/1.27.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
deleted file mode 100644
index bd63773..0000000
--- a/dev-lang/rust/files/1.27.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-diff -Naur rustc-1.27.0-src.orig/config.toml.example rustc-1.27.0-src/config.toml.example
---- rustc-1.27.0-src.orig/config.toml.example 2018-06-27 09:52:27.113947671 -0700
-+++ rustc-1.27.0-src/config.toml.example 2018-06-27 09:53:12.820946852 -0700
-@@ -395,12 +395,6 @@
- # only use static libraries. If unset, the target's default linkage is used.
- #crt-static = false
-
--# The root location of the MUSL installation directory. The library directory
--# will also need to contain libunwind.a for an unwinding implementation. Note
--# that this option only makes sense for MUSL targets that produce statically
--# linked binaries
--#musl-root = "..."
--
- # Used in testing for configuring where the QEMU images are located, you
- # probably don't want to use this.
- #qemu-rootfs = "..."
-diff -Naur rustc-1.27.0-src.orig/src/bootstrap/bin/rustc.rs rustc-1.27.0-src/src/bootstrap/bin/rustc.rs
---- rustc-1.27.0-src.orig/src/bootstrap/bin/rustc.rs 2018-06-27 09:52:24.438947719 -0700
-+++ rustc-1.27.0-src/src/bootstrap/bin/rustc.rs 2018-06-27 09:53:37.396946412 -0700
-@@ -30,7 +30,6 @@
- extern crate bootstrap;
-
- use std::env;
--use std::ffi::OsString;
- use std::io;
- use std::path::PathBuf;
- use std::process::Command;
-@@ -126,15 +125,6 @@
- cmd.arg("-Cprefer-dynamic");
- }
-
-- // Help the libc crate compile by assisting it in finding the MUSL
-- // native libraries.
-- if let Some(s) = env::var_os("MUSL_ROOT") {
-- let mut root = OsString::from("native=");
-- root.push(&s);
-- root.push("/lib");
-- cmd.arg("-L").arg(&root);
-- }
--
- // Override linker if necessary.
- if let Ok(target_linker) = env::var("RUSTC_TARGET_LINKER") {
- cmd.arg(format!("-Clinker={}", target_linker));
-diff -Naur rustc-1.27.0-src.orig/src/bootstrap/cc_detect.rs rustc-1.27.0-src/src/bootstrap/cc_detect.rs
---- rustc-1.27.0-src.orig/src/bootstrap/cc_detect.rs 2018-06-27 09:52:24.438947719 -0700
-+++ rustc-1.27.0-src/src/bootstrap/cc_detect.rs 2018-06-27 09:55:01.019944915 -0700
-@@ -95,7 +95,7 @@
- if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
- cfg.compiler(cc);
- } else {
-- set_compiler(&mut cfg, Language::C, target, config, build);
-+ set_compiler(&mut cfg, Language::C, target, config);
- }
-
- let compiler = cfg.get_compiler();
-@@ -124,7 +124,7 @@
- if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) {
- cfg.compiler(cxx);
- } else {
-- set_compiler(&mut cfg, Language::CPlusPlus, host, config, build);
-+ set_compiler(&mut cfg, Language::CPlusPlus, host, config);
- }
- let compiler = cfg.get_compiler();
- build.verbose(&format!("CXX_{} = {:?}", host, compiler.path()));
-@@ -135,8 +135,7 @@
- fn set_compiler(cfg: &mut cc::Build,
- compiler: Language,
- target: Interned<String>,
-- config: Option<&Target>,
-- build: &Build) {
-+ config: Option<&Target>) {
- match &*target {
- // When compiling for android we may have the NDK configured in the
- // config.toml in which case we look there. Otherwise the default
-@@ -173,26 +172,6 @@
- }
- }
-
-- "mips-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mips-linux-musl-gcc");
-- }
-- }
-- "mipsel-unknown-linux-musl" => {
-- if cfg.get_compiler().path().to_str() == Some("gcc") {
-- cfg.compiler("mipsel-linux-musl-gcc");
-- }
-- }
--
-- t if t.contains("musl") => {
-- if let Some(root) = build.musl_root(target) {
-- let guess = root.join("bin/musl-gcc");
-- if guess.exists() {
-- cfg.compiler(guess);
-- }
-- }
-- }
--
- _ => {}
- }
- }
-diff -Naur rustc-1.27.0-src.orig/src/bootstrap/compile.rs rustc-1.27.0-src/src/bootstrap/compile.rs
---- rustc-1.27.0-src.orig/src/bootstrap/compile.rs 2018-06-27 09:52:24.438947719 -0700
-+++ rustc-1.27.0-src/src/bootstrap/compile.rs 2018-06-27 09:55:41.457944191 -0700
-@@ -78,13 +78,6 @@
- });
- builder.info(&format!("Uplifting stage1 std ({} -> {})", from.host, target));
-
-- // Even if we're not building std this stage, the new sysroot must
-- // still contain the musl startup objects.
-- if target.contains("musl") {
-- let libdir = builder.sysroot_libdir(compiler, target);
-- copy_musl_third_party_objects(builder, target, &libdir);
-- }
--
- builder.ensure(StdLink {
- compiler: from,
- target_compiler: compiler,
-@@ -93,11 +86,6 @@
- return;
- }
-
-- if target.contains("musl") {
-- let libdir = builder.sysroot_libdir(compiler, target);
-- copy_musl_third_party_objects(builder, target, &libdir);
-- }
--
- let out_dir = builder.cargo_out(compiler, Mode::Libstd, target);
- builder.clear_if_dirty(&out_dir, &builder.rustc(compiler));
- let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "build");
-@@ -119,20 +107,6 @@
- }
- }
-
--/// Copies the crt(1,i,n).o startup objects
--///
--/// Since musl supports fully static linking, we can cross link for it even
--/// with a glibc-targeting toolchain, given we have the appropriate startup
--/// files. As those shipped with glibc won't work, copy the ones provided by
--/// musl so we have them on linux-gnu hosts.
--fn copy_musl_third_party_objects(builder: &Builder,
-- target: Interned<String>,
-- into: &Path) {
-- for &obj in &["crt1.o", "crti.o", "crtn.o"] {
-- builder.copy(&builder.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj));
-- }
--}
--
- /// Configure cargo to compile the standard library, adding appropriate env vars
- /// and such.
- pub fn std_cargo(builder: &Builder,
-@@ -187,11 +161,6 @@
- cargo.env("JEMALLOC_OVERRIDE", jemalloc);
- }
- }
-- if target.contains("musl") {
-- if let Some(p) = builder.musl_root(target) {
-- cargo.env("MUSL_ROOT", p);
-- }
-- }
- }
- }
-
-diff -Naur rustc-1.27.0-src.orig/src/bootstrap/config.rs rustc-1.27.0-src/src/bootstrap/config.rs
---- rustc-1.27.0-src.orig/src/bootstrap/config.rs 2018-06-27 09:52:24.438947719 -0700
-+++ rustc-1.27.0-src/src/bootstrap/config.rs 2018-06-27 09:56:06.336943745 -0700
-@@ -129,8 +129,6 @@
- pub save_toolstates: Option<PathBuf>,
- pub print_step_timings: bool,
-
-- // Fallback musl-root for all targets
-- pub musl_root: Option<PathBuf>,
- pub prefix: Option<PathBuf>,
- pub sysconfdir: Option<PathBuf>,
- pub datadir: Option<PathBuf>,
-@@ -163,7 +161,6 @@
- pub linker: Option<PathBuf>,
- pub ndk: Option<PathBuf>,
- pub crt_static: Option<bool>,
-- pub musl_root: Option<PathBuf>,
- pub qemu_rootfs: Option<PathBuf>,
- pub no_std: bool,
- }
-@@ -291,7 +288,6 @@
- backtrace: Option<bool>,
- default_linker: Option<String>,
- channel: Option<String>,
-- musl_root: Option<String>,
- rpath: Option<bool>,
- optimize_tests: Option<bool>,
- debuginfo_tests: Option<bool>,
-@@ -322,7 +318,6 @@
- linker: Option<String>,
- android_ndk: Option<String>,
- crt_static: Option<bool>,
-- musl_root: Option<String>,
- qemu_rootfs: Option<String>,
- }
-
-@@ -530,7 +525,6 @@
- set(&mut config.lld_enabled, rust.lld);
- config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);
- config.rustc_default_linker = rust.default_linker.clone();
-- config.musl_root = rust.musl_root.clone().map(PathBuf::from);
- config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
- set(&mut config.deny_warnings, rust.deny_warnings.or(flags.warnings));
- set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -568,7 +562,6 @@
- target.ar = cfg.ar.clone().map(PathBuf::from);
- target.linker = cfg.linker.clone().map(PathBuf::from);
- target.crt_static = cfg.crt_static.clone();
-- target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
- target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
-
- config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
-diff -Naur rustc-1.27.0-src.orig/src/bootstrap/configure.py rustc-1.27.0-src/src/bootstrap/configure.py
---- rustc-1.27.0-src.orig/src/bootstrap/configure.py 2018-06-27 09:52:24.438947719 -0700
-+++ rustc-1.27.0-src/src/bootstrap/configure.py 2018-06-27 09:56:30.159943318 -0700
-@@ -108,28 +108,6 @@
- "aarch64-linux-android NDK standalone path")
- v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
- "x86_64-linux-android NDK standalone path")
--v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
-- "MUSL root installation directory (deprecated)")
--v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",
-- "x86_64-unknown-linux-musl install directory")
--v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root",
-- "i586-unknown-linux-musl install directory")
--v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root",
-- "i686-unknown-linux-musl install directory")
--v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
-- "arm-unknown-linux-musleabi install directory")
--v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
-- "arm-unknown-linux-musleabihf install directory")
--v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
-- "armv5te-unknown-linux-musleabi install directory")
--v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
-- "armv7-unknown-linux-musleabihf install directory")
--v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
-- "aarch64-unknown-linux-musl install directory")
--v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root",
-- "mips-unknown-linux-musl install directory")
--v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
-- "mipsel-unknown-linux-musl install directory")
- v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
- "rootfs in qemu testing, you probably don't want to use this")
- v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
-diff -Naur rustc-1.27.0-src.orig/src/bootstrap/lib.rs rustc-1.27.0-src/src/bootstrap/lib.rs
---- rustc-1.27.0-src.orig/src/bootstrap/lib.rs 2018-06-27 09:52:24.438947719 -0700
-+++ rustc-1.27.0-src/src/bootstrap/lib.rs 2018-06-27 09:56:40.317943136 -0700
-@@ -751,14 +751,6 @@
- }
- }
-
-- /// Returns the "musl root" for this `target`, if defined
-- fn musl_root(&self, target: Interned<String>) -> Option<&Path> {
-- self.config.target_config.get(&target)
-- .and_then(|t| t.musl_root.as_ref())
-- .or(self.config.musl_root.as_ref())
-- .map(|p| &**p)
-- }
--
- /// Returns true if this is a no-std `target`, if defined
- fn no_std(&self, target: Interned<String>) -> Option<bool> {
- self.config.target_config.get(&target)
-diff -Naur rustc-1.27.0-src.orig/src/bootstrap/sanity.rs rustc-1.27.0-src/src/bootstrap/sanity.rs
---- rustc-1.27.0-src.orig/src/bootstrap/sanity.rs 2018-06-27 09:52:24.438947719 -0700
-+++ rustc-1.27.0-src/src/bootstrap/sanity.rs 2018-06-27 09:57:09.096942621 -0700
-@@ -21,7 +21,7 @@
- use std::collections::HashMap;
- use std::env;
- use std::ffi::{OsString, OsStr};
--use std::fs::{self, File};
-+use std::fs::File;
- use std::io::Read;
- use std::path::PathBuf;
- use std::process::Command;
-@@ -186,34 +186,6 @@
- }
- }
-
-- // Make sure musl-root is valid
-- if target.contains("musl") {
-- // If this is a native target (host is also musl) and no musl-root is given,
-- // fall back to the system toolchain in /usr before giving up
-- if build.musl_root(*target).is_none() && build.config.build == *target {
-- let target = build.config.target_config.entry(target.clone())
-- .or_insert(Default::default());
-- target.musl_root = Some("/usr".into());
-- }
-- match build.musl_root(*target) {
-- Some(root) => {
-- if fs::metadata(root.join("lib/libc.a")).is_err() {
-- panic!("couldn't find libc.a in musl dir: {}",
-- root.join("lib").display());
-- }
-- if fs::metadata(root.join("lib/libunwind.a")).is_err() {
-- panic!("couldn't find libunwind.a in musl dir: {}",
-- root.join("lib").display());
-- }
-- }
-- None => {
-- panic!("when targeting MUSL either the rust.musl-root \
-- option or the target.$TARGET.musl-root option must \
-- be specified in config.toml")
-- }
-- }
-- }
--
- if target.contains("msvc") {
- // There are three builds of cmake on windows: MSVC, MinGW, and
- // Cygwin. The Cygwin build does not have generators for Visual
-diff -Naur rustc-1.27.0-src.orig/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile rustc-1.27.0-src/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
---- rustc-1.27.0-src.orig/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile 2018-06-27 09:52:23.560947734 -0700
-+++ rustc-1.27.0-src/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile 2018-06-27 09:57:22.478942381 -0700
-@@ -30,8 +30,6 @@
- RUN sh /scripts/sccache.sh
-
- ENV RUST_CONFIGURE_ARGS \
-- --musl-root-i586=/musl-i586 \
-- --musl-root-i686=/musl-i686 \
- --enable-extended \
- --disable-docs
-
-diff -Naur rustc-1.27.0-src.orig/src/ci/docker/dist-various-1/Dockerfile rustc-1.27.0-src/src/ci/docker/dist-various-1/Dockerfile
---- rustc-1.27.0-src.orig/src/ci/docker/dist-various-1/Dockerfile 2018-06-27 09:52:23.561947734 -0700
-+++ rustc-1.27.0-src/src/ci/docker/dist-various-1/Dockerfile 2018-06-27 09:57:47.163941939 -0700
-@@ -110,13 +110,6 @@
- CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft"
-
- ENV RUST_CONFIGURE_ARGS \
-- --musl-root-armv5te=/musl-armv5te \
-- --musl-root-arm=/musl-arm \
-- --musl-root-armhf=/musl-armhf \
-- --musl-root-armv7=/musl-armv7 \
-- --musl-root-aarch64=/musl-aarch64 \
-- --musl-root-mips=/musl-mips \
-- --musl-root-mipsel=/musl-mipsel \
- --enable-emscripten \
- --disable-docs
-
-diff -Naur rustc-1.27.0-src.orig/src/ci/docker/dist-x86_64-musl/Dockerfile rustc-1.27.0-src/src/ci/docker/dist-x86_64-musl/Dockerfile
---- rustc-1.27.0-src.orig/src/ci/docker/dist-x86_64-musl/Dockerfile 2018-06-27 09:52:23.559947734 -0700
-+++ rustc-1.27.0-src/src/ci/docker/dist-x86_64-musl/Dockerfile 2018-06-27 09:58:00.620941698 -0700
-@@ -30,7 +30,6 @@
- RUN sh /scripts/sccache.sh
-
- ENV RUST_CONFIGURE_ARGS \
-- --musl-root-x86_64=/musl-x86_64 \
- --enable-extended \
- --disable-docs
-
-diff -Naur rustc-1.27.0-src.orig/src/librustc_target/spec/linux_musl_base.rs rustc-1.27.0-src/src/librustc_target/spec/linux_musl_base.rs
---- rustc-1.27.0-src.orig/src/librustc_target/spec/linux_musl_base.rs 2018-06-27 09:52:22.322947757 -0700
-+++ rustc-1.27.0-src/src/librustc_target/spec/linux_musl_base.rs 2018-06-27 09:59:09.776940460 -0700
-@@ -13,10 +13,6 @@
- pub fn opts() -> TargetOptions {
- let mut base = super::linux_base::opts();
-
-- // Make sure that the linker/gcc really don't pull in anything, including
-- // default objects, libs, etc.
-- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-nostdlib".to_string());
--
- // At least when this was tested, the linker would not add the
- // `GNU_EH_FRAME` program header to executables generated, which is required
- // when unwinding to locate the unwinding information. I'm not sure why this
-@@ -48,17 +44,6 @@
- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,-(".to_string());
- base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-Wl,-)".to_string()]);
-
-- // When generating a statically linked executable there's generally some
-- // small setup needed which is listed in these files. These are provided by
-- // a musl toolchain and are linked by default by the `musl-gcc` script. Note
-- // that `gcc` also does this by default, it just uses some different files.
-- //
-- // Each target directory for musl has these object files included in it so
-- // they'll be included from there.
-- base.pre_link_objects_exe.push("crt1.o".to_string());
-- base.pre_link_objects_exe.push("crti.o".to_string());
-- base.post_link_objects.push("crtn.o".to_string());
--
- // These targets statically link libc by default
- base.crt_static_default = true;
- // These targets allow the user to choose between static and dynamic linking.
diff --git a/dev-lang/rust/files/1.27.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch b/dev-lang/rust/files/1.27.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
deleted file mode 100644
index f0b4b74..0000000
--- a/dev-lang/rust/files/1.27.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur rustc-1.27.0-src.orig/src/librustc_target/spec/linux_musl_base.rs rustc-1.27.0-src/src/librustc_target/spec/linux_musl_base.rs
---- rustc-1.27.0-src.orig/src/librustc_target/spec/linux_musl_base.rs 2018-06-27 09:52:22.322947757 -0700
-+++ rustc-1.27.0-src/src/librustc_target/spec/linux_musl_base.rs 2018-06-27 10:08:26.989930481 -0700
-@@ -59,8 +59,6 @@
- base.pre_link_objects_exe.push("crti.o".to_string());
- base.post_link_objects.push("crtn.o".to_string());
-
-- // These targets statically link libc by default
-- base.crt_static_default = true;
- // These targets allow the user to choose between static and dynamic linking.
- base.crt_static_respected = true;
-
diff --git a/dev-lang/rust/files/rust-1.26.0-libressl-2.7.0.patch b/dev-lang/rust/files/rust-1.26.0-libressl-2.7.0.patch
deleted file mode 100644
index 190ad0c..0000000
--- a/dev-lang/rust/files/rust-1.26.0-libressl-2.7.0.patch
+++ /dev/null
@@ -1,481 +0,0 @@
---- a/src/vendor/libgit2-sys/libgit2/src/streams/openssl.c 2018-05-07 18:50:07 UTC
-+++ b/src/vendor/libgit2-sys/libgit2/src/streams/openssl.c
-@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void)
- ssl_opts |= SSL_OP_NO_COMPRESSION;
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- SSL_load_error_strings();
- OpenSSL_add_ssl_algorithms();
- #else
---- a/src/vendor/libgit2-sys/libgit2/src/streams/openssl.h 2018-05-07 18:50:07 UTC
-+++ b/src/vendor/libgit2-sys/libgit2/src/streams/openssl.h
-@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char *
-
-
-
--# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
-
- GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
- {
---- a/src/vendor/openssl-sys/build.rs 2018-05-07 18:50:12 UTC
-+++ b/src/vendor/openssl-sys/build.rs
-@@ -323,8 +323,10 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Versi
- #include <openssl/opensslv.h>
- #include <openssl/opensslconf.h>
-
--#if LIBRESSL_VERSION_NUMBER >= 0x20700000
-+#if LIBRESSL_VERSION_NUMBER >= 0x20800000
- RUST_LIBRESSL_NEW
-+#elif LIBRESSL_VERSION_NUMBER >= 0x20700000
-+RUST_LIBRESSL_27X
- #elif LIBRESSL_VERSION_NUMBER >= 0x20603000
- RUST_LIBRESSL_26X
- #elif LIBRESSL_VERSION_NUMBER >= 0x20602000
-@@ -473,6 +475,13 @@ See rust-openssl README for more information:
- println!("cargo:libressl_version=26x");
- println!("cargo:version=101");
- Version::Libressl
-+ } else if expanded.contains("RUST_LIBRESSL_27X") {
-+ println!("cargo:rustc-cfg=libressl");
-+ println!("cargo:rustc-cfg=libressl27");
-+ println!("cargo:libressl=true");
-+ println!("cargo:libressl_version=27x");
-+ println!("cargo:version=101");
-+ Version::Libressl
- } else if expanded.contains("RUST_OPENSSL_111") {
- println!("cargo:rustc-cfg=ossl111");
- println!("cargo:rustc-cfg=ossl110");
-@@ -501,7 +510,7 @@ See rust-openssl README for more information:
- "
-
- This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
--and 2.6, but a different version of OpenSSL was found. The build is now aborting
-+through 2.7, but a different version of OpenSSL was found. The build is now aborting
- due to this version mismatch.
-
- "
---- a/src/vendor/openssl-sys/src/lib.rs 2018-05-07 18:50:12 UTC
-+++ b/src/vendor/openssl-sys/src/lib.rs
-@@ -221,6 +221,7 @@ pub const PEM_R_NO_START_LINE: c_int = 108;
- pub const EVP_MAX_MD_SIZE: c_uint = 64;
- pub const EVP_PKEY_RSA: c_int = NID_rsaEncryption;
- pub const EVP_PKEY_HMAC: c_int = NID_hmac;
-+pub const EVP_PKEY_CMAC: c_int = NID_cmac;
- pub const EVP_PKEY_DSA: c_int = NID_dsa;
- pub const EVP_PKEY_DH: c_int = NID_dhKeyAgreement;
- pub const EVP_PKEY_EC: c_int = NID_X9_62_id_ecPublicKey;
-@@ -228,9 +229,29 @@ pub const EVP_PKEY_EC: c_int = NID_X9_62_id_ecPublicKe
- pub const EVP_PKEY_ALG_CTRL: c_int = 0x1000;
-
- pub const EVP_PKEY_CTRL_RSA_PADDING: c_int = EVP_PKEY_ALG_CTRL + 1;
-+pub const EVP_PKEY_CTRL_RSA_PSS_SALTLEN: c_int = EVP_PKEY_ALG_CTRL + 2;
-
-+pub const EVP_PKEY_CTRL_RSA_MGF1_MD: c_int = EVP_PKEY_ALG_CTRL + 5;
- pub const EVP_PKEY_CTRL_GET_RSA_PADDING: c_int = EVP_PKEY_ALG_CTRL + 6;
-
-+pub const EVP_PKEY_CTRL_SET_MAC_KEY: c_int = 6;
-+pub const EVP_PKEY_CTRL_CIPHER: c_int = 12;
-+
-+pub const EVP_PKEY_OP_KEYGEN: c_int = 1 << 2;
-+pub const EVP_PKEY_OP_SIGN: c_int = 1 << 3;
-+pub const EVP_PKEY_OP_VERIFY: c_int = 1 << 4;
-+pub const EVP_PKEY_OP_VERIFYRECOVER: c_int = 1 << 5;
-+pub const EVP_PKEY_OP_SIGNCTX: c_int = 1 << 6;
-+pub const EVP_PKEY_OP_VERIFYCTX: c_int = 1 << 7;
-+pub const EVP_PKEY_OP_ENCRYPT: c_int = 1 << 8;
-+pub const EVP_PKEY_OP_DECRYPT: c_int = 1 << 9;
-+
-+pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY
-+ | EVP_PKEY_OP_VERIFYRECOVER | EVP_PKEY_OP_SIGNCTX
-+ | EVP_PKEY_OP_VERIFYCTX;
-+
-+pub const EVP_PKEY_OP_TYPE_CRYPT: c_int = EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT;
-+
- pub const EVP_CTRL_GCM_SET_IVLEN: c_int = 0x9;
- pub const EVP_CTRL_GCM_GET_TAG: c_int = 0x10;
- pub const EVP_CTRL_GCM_SET_TAG: c_int = 0x11;
-@@ -1200,9 +1221,16 @@ pub const RSA_SSLV23_PADDING: c_int = 2;
- pub const RSA_NO_PADDING: c_int = 3;
- pub const RSA_PKCS1_OAEP_PADDING: c_int = 4;
- pub const RSA_X931_PADDING: c_int = 5;
-+pub const RSA_PKCS1_PSS_PADDING: c_int = 6;
-
- pub const SHA_LBLOCK: c_int = 16;
-
-+pub const SSL3_AD_ILLEGAL_PARAMETER: c_int = 47;
-+pub const SSL_AD_ILLEGAL_PARAMETER: c_int = SSL3_AD_ILLEGAL_PARAMETER;
-+
-+pub const TLS1_AD_DECODE_ERROR: c_int = 50;
-+pub const SSL_AD_DECODE_ERROR: c_int = TLS1_AD_DECODE_ERROR;
-+
- pub const TLS1_AD_UNRECOGNIZED_NAME: c_int = 112;
- pub const SSL_AD_UNRECOGNIZED_NAME: c_int = TLS1_AD_UNRECOGNIZED_NAME;
-
-@@ -1249,14 +1277,14 @@ pub const SSL_VERIFY_NONE: c_int = 0;
- pub const SSL_VERIFY_PEER: c_int = 1;
- pub const SSL_VERIFY_FAIL_IF_NO_PEER_CERT: c_int = 2;
-
--#[cfg(not(any(libressl261, libressl262, libressl26x, ossl101)))]
-+#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27, ossl101)))]
- pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x00000010;
--#[cfg(any(libressl261, libressl262, libressl26x))]
-+#[cfg(any(libressl261, libressl262, libressl26x, libressl27))]
- pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0;
- pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800;
--#[cfg(not(any(libressl261, libressl262, libressl26x)))]
-+#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27)))]
- pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000;
--#[cfg(any(libressl261, libressl262, libressl26x))]
-+#[cfg(any(libressl261, libressl262, libressl26x, libressl27))]
- pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0;
- pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004;
- #[cfg(not(libressl))]
-@@ -1477,6 +1505,28 @@ pub unsafe fn EVP_PKEY_CTX_get_rsa_padding(ctx: *mut E
- )
- }
-
-+pub unsafe fn EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx: *mut EVP_PKEY_CTX, len: c_int) -> c_int {
-+ EVP_PKEY_CTX_ctrl(
-+ ctx,
-+ EVP_PKEY_RSA,
-+ EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY,
-+ EVP_PKEY_CTRL_RSA_PSS_SALTLEN,
-+ len,
-+ ptr::null_mut(),
-+ )
-+}
-+
-+pub unsafe fn EVP_PKEY_CTX_set_rsa_mgf1_md(ctx: *mut EVP_PKEY_CTX, md: *mut EVP_MD) -> c_int {
-+ EVP_PKEY_CTX_ctrl(
-+ ctx,
-+ EVP_PKEY_RSA,
-+ EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
-+ EVP_PKEY_CTRL_RSA_MGF1_MD,
-+ 0,
-+ md as *mut c_void,
-+ )
-+}
-+
- pub unsafe fn SSL_CTX_set_mode(ctx: *mut SSL_CTX, op: c_long) -> c_long {
- SSL_CTX_ctrl(ctx, SSL_CTRL_MODE, op, ptr::null_mut())
- }
-@@ -1605,6 +1655,7 @@ extern "C" {
-
- pub fn ASN1_INTEGER_get(dest: *const ASN1_INTEGER) -> c_long;
- pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;
-+ pub fn ASN1_INTEGER_to_BN(ai: *const ASN1_INTEGER, bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn ASN1_GENERALIZEDTIME_free(tm: *mut ASN1_GENERALIZEDTIME);
- pub fn ASN1_GENERALIZEDTIME_print(b: *mut BIO, tm: *const ASN1_GENERALIZEDTIME) -> c_int;
- pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING;
-@@ -1876,6 +1927,20 @@ extern "C" {
- ctx: *mut BN_CTX,
- ) -> c_int;
-
-+ pub fn ECDSA_SIG_new() -> *mut ECDSA_SIG;
-+ pub fn ECDSA_SIG_free(sig: *mut ECDSA_SIG);
-+ pub fn ECDSA_do_verify(
-+ dgst: *const c_uchar,
-+ dgst_len: c_int,
-+ sig: *const ECDSA_SIG,
-+ eckey: *mut EC_KEY,
-+ ) -> c_int;
-+ pub fn ECDSA_do_sign(
-+ dgst: *const c_uchar,
-+ dgst_len: c_int,
-+ eckey: *mut EC_KEY,
-+ ) -> *mut ECDSA_SIG;
-+
- pub fn ERR_peek_last_error() -> c_ulong;
- pub fn ERR_get_error() -> c_ulong;
- pub fn ERR_get_error_line_data(
-@@ -1904,6 +1969,7 @@ extern "C" {
- pub fn EVP_aes_128_xts() -> *const EVP_CIPHER;
- pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER;
- pub fn EVP_aes_128_gcm() -> *const EVP_CIPHER;
-+ pub fn EVP_aes_128_ccm() -> *const EVP_CIPHER;
- pub fn EVP_aes_128_cfb1() -> *const EVP_CIPHER;
- pub fn EVP_aes_128_cfb128() -> *const EVP_CIPHER;
- pub fn EVP_aes_128_cfb8() -> *const EVP_CIPHER;
-@@ -1912,6 +1978,7 @@ extern "C" {
- pub fn EVP_aes_256_xts() -> *const EVP_CIPHER;
- pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER;
- pub fn EVP_aes_256_gcm() -> *const EVP_CIPHER;
-+ pub fn EVP_aes_256_ccm() -> *const EVP_CIPHER;
- pub fn EVP_aes_256_cfb1() -> *const EVP_CIPHER;
- pub fn EVP_aes_256_cfb128() -> *const EVP_CIPHER;
- pub fn EVP_aes_256_cfb8() -> *const EVP_CIPHER;
-@@ -2023,6 +2090,7 @@ extern "C" {
- pub fn EVP_PKEY_get1_DH(k: *mut EVP_PKEY) -> *mut DH;
- pub fn EVP_PKEY_get1_EC_KEY(k: *mut EVP_PKEY) -> *mut EC_KEY;
- pub fn EVP_PKEY_cmp(a: *const EVP_PKEY, b: *const EVP_PKEY) -> c_int;
-+ pub fn EVP_PKEY_id(pkey: *const EVP_PKEY) -> c_int;
- pub fn EVP_PKEY_new_mac_key(
- type_: c_int,
- e: *mut ENGINE,
-@@ -2040,6 +2108,7 @@ extern "C" {
- ) -> *mut EVP_PKEY;
-
- pub fn EVP_PKEY_CTX_new(k: *mut EVP_PKEY, e: *mut ENGINE) -> *mut EVP_PKEY_CTX;
-+ pub fn EVP_PKEY_CTX_new_id(id: c_int, e: *mut ENGINE) -> *mut EVP_PKEY_CTX;
- pub fn EVP_PKEY_CTX_free(ctx: *mut EVP_PKEY_CTX);
- pub fn EVP_PKEY_CTX_ctrl(
- ctx: *mut EVP_PKEY_CTX,
-@@ -2050,6 +2119,9 @@ extern "C" {
- p2: *mut c_void,
- ) -> c_int;
-
-+ pub fn EVP_PKEY_keygen_init(ctx: *mut EVP_PKEY_CTX) -> c_int;
-+ pub fn EVP_PKEY_keygen(ctx: *mut EVP_PKEY_CTX, key: *mut *mut EVP_PKEY) -> c_int;
-+
- pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *mut HMAC_CTX) -> c_int;
-
- pub fn OBJ_obj2nid(o: *const ASN1_OBJECT) -> c_int;
-@@ -2059,6 +2131,7 @@ extern "C" {
- a: *const ASN1_OBJECT,
- no_name: c_int,
- ) -> c_int;
-+ pub fn OBJ_nid2sn(nid: c_int) -> *const c_char;
-
- pub fn OCSP_BASICRESP_new() -> *mut OCSP_BASICRESP;
- pub fn OCSP_BASICRESP_free(r: *mut OCSP_BASICRESP);
-@@ -2605,6 +2678,7 @@ extern "C" {
- pub fn X509_sign(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int;
- pub fn X509_get_pubkey(x: *mut X509) -> *mut EVP_PKEY;
- pub fn X509_to_X509_REQ(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> *mut X509_REQ;
-+ pub fn X509_verify_cert(ctx: *mut X509_STORE_CTX) -> c_int;
- pub fn X509_verify_cert_error_string(n: c_long) -> *const c_char;
- pub fn X509_get1_ocsp(x: *mut X509) -> *mut stack_st_OPENSSL_STRING;
- pub fn X509_check_issued(issuer: *mut X509, subject: *mut X509) -> c_int;
-@@ -2638,6 +2712,14 @@ extern "C" {
- pub fn X509_STORE_add_cert(store: *mut X509_STORE, x: *mut X509) -> c_int;
- pub fn X509_STORE_set_default_paths(store: *mut X509_STORE) -> c_int;
-
-+ pub fn X509_STORE_CTX_new() -> *mut X509_STORE_CTX;
-+ pub fn X509_STORE_CTX_cleanup(ctx: *mut X509_STORE_CTX);
-+ pub fn X509_STORE_CTX_init(
-+ ctx: *mut X509_STORE_CTX,
-+ store: *mut X509_STORE,
-+ x509: *mut X509,
-+ chain: *mut stack_st_X509,
-+ ) -> c_int;
- pub fn X509_STORE_CTX_free(ctx: *mut X509_STORE_CTX);
- pub fn X509_STORE_CTX_get_current_cert(ctx: *mut X509_STORE_CTX) -> *mut X509;
- pub fn X509_STORE_CTX_get_error(ctx: *mut X509_STORE_CTX) -> c_int;
-@@ -2772,30 +2854,25 @@ extern "C" {
-
- pub fn SSL_CTX_set_cookie_generate_cb(
- s: *mut SSL_CTX,
-- cb: Option<extern "C" fn(
-- ssl: *mut SSL,
-- cookie: *mut c_uchar,
-- cookie_len: *mut c_uint
-- ) -> c_int>
-+ cb: Option<
-+ extern "C" fn(ssl: *mut SSL, cookie: *mut c_uchar, cookie_len: *mut c_uint) -> c_int,
-+ >,
- );
-
- #[cfg(ossl110)]
- pub fn SSL_CTX_set_cookie_verify_cb(
- s: *mut SSL_CTX,
-- cb: Option<extern "C" fn(
-- ssl: *mut SSL,
-- cookie: *const c_uchar,
-- cookie_len: c_uint
-- ) -> c_int>
-+ cb: Option<
-+ extern "C" fn(ssl: *mut SSL, cookie: *const c_uchar, cookie_len: c_uint) -> c_int,
-+ >,
- );
-
- #[cfg(not(ossl110))]
- pub fn SSL_CTX_set_cookie_verify_cb(
- s: *mut SSL_CTX,
-- cb: Option<extern "C" fn(
-- ssl: *mut SSL,
-- cookie: *mut c_uchar,
-- cookie_len: c_uint
-- ) -> c_int>
-+ cb: Option<extern "C" fn(ssl: *mut SSL, cookie: *mut c_uchar, cookie_len: c_uint) -> c_int>,
- );
-+
-+ pub fn EVP_MD_size(md: *const EVP_MD) -> c_int;
-+ pub fn EVP_get_cipherbyname(name: *const c_char) -> *const EVP_CIPHER;
- }
---- a/src/vendor/openssl-sys/src/libressl/mod.rs 2018-05-07 18:50:12 UTC
-+++ b/src/vendor/openssl-sys/src/libressl/mod.rs
-@@ -134,6 +134,12 @@ pub struct DSA {
- }
-
- #[repr(C)]
-+pub struct ECDSA_SIG {
-+ pub r: *mut ::BIGNUM,
-+ pub s: *mut ::BIGNUM,
-+}
-+
-+#[repr(C)]
- pub struct EVP_PKEY {
- pub type_: c_int,
- pub save_type: c_int,
-@@ -331,9 +337,9 @@ pub const SSL_CTRL_OPTIONS: c_int = 32;
- pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77;
- pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94;
-
--#[cfg(any(libressl261, libressl262, libressl26x))]
-+#[cfg(any(libressl261, libressl262, libressl26x, libressl27))]
- pub const SSL_OP_ALL: c_ulong = 0x4;
--#[cfg(not(any(libressl261, libressl262, libressl26x)))]
-+#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27)))]
- pub const SSL_OP_ALL: c_ulong = 0x80000014;
- pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0;
- pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0;
-@@ -346,9 +352,9 @@ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong =
- pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0;
- pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0;
- pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0;
--#[cfg(any(libressl261, libressl262, libressl26x))]
-+#[cfg(any(libressl261, libressl262, libressl26x, libressl27))]
- pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0;
--#[cfg(not(any(libressl261, libressl262, libressl26x)))]
-+#[cfg(not(any(libressl261, libressl262, libressl26x, libressl27)))]
- pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000;
- pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000;
- pub const SSL_OP_NO_SSLv2: c_ulong = 0x0;
---- a/src/vendor/openssl-sys/src/ossl10x.rs 2018-05-07 18:50:12 UTC
-+++ b/src/vendor/openssl-sys/src/ossl10x.rs
-@@ -129,6 +129,12 @@ pub struct DSA {
- }
-
- #[repr(C)]
-+pub struct ECDSA_SIG {
-+ pub r: *mut BIGNUM,
-+ pub s: *mut BIGNUM
-+}
-+
-+#[repr(C)]
- pub struct EVP_PKEY {
- pub type_: c_int,
- pub save_type: c_int,
-@@ -969,4 +975,7 @@ extern "C" {
-
- pub fn SSLeay() -> c_ulong;
- pub fn SSLeay_version(key: c_int) -> *const c_char;
-+
-+ #[cfg(ossl102)]
-+ pub fn SSL_extension_supported(ext_type: c_uint) -> c_int;
- }
---- a/src/vendor/openssl-sys/src/ossl110.rs 2018-05-07 18:50:12 UTC
-+++ b/src/vendor/openssl-sys/src/ossl110.rs
-@@ -8,6 +8,7 @@ pub enum BIO_METHOD {}
- pub enum CRYPTO_EX_DATA {}
- pub enum DH {}
- pub enum DSA {}
-+pub enum ECDSA_SIG {}
- pub enum EVP_CIPHER {}
- pub enum EVP_MD_CTX {}
- pub enum EVP_PKEY {}
-@@ -363,4 +364,10 @@ extern "C" {
- ) -> *mut PKCS12;
- pub fn X509_REQ_get_version(req: *const X509_REQ) -> c_long;
- pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut ::X509_NAME;
-+ pub fn SSL_extension_supported(ext_type: c_uint) -> c_int;
-+ pub fn ECDSA_SIG_get0(sig: *const ECDSA_SIG, pr: *mut *const BIGNUM, ps: *mut *const BIGNUM);
-+ pub fn ECDSA_SIG_set0(sig: *mut ECDSA_SIG, pr: *mut BIGNUM, ps: *mut BIGNUM) -> c_int;
-+
-+ pub fn SSL_CIPHER_get_cipher_nid(c: *const ::SSL_CIPHER) -> c_int;
-+ pub fn SSL_CIPHER_get_digest_nid(c: *const ::SSL_CIPHER) -> c_int;
- }
---- a/src/vendor/openssl-sys/src/ossl111.rs 2018-05-07 18:50:12 UTC
-+++ b/src/vendor/openssl-sys/src/ossl111.rs
-@@ -1,15 +1,84 @@
--use libc::{c_char, c_int, c_ulong};
-+use libc::{c_char, c_uchar, c_int, c_uint, c_ulong, size_t, c_void};
-
- pub type SSL_CTX_keylog_cb_func =
- Option<unsafe extern "C" fn(ssl: *const ::SSL, line: *const c_char)>;
-
--pub const SSL_COOKIE_LENGTH: c_int = 255;
-+pub type SSL_custom_ext_add_cb_ex =
-+ Option<unsafe extern "C" fn(ssl: *mut ::SSL, ext_type: c_uint,
-+ context: c_uint,
-+ out: *mut *const c_uchar,
-+ outlen: *mut size_t, x: *mut ::X509,
-+ chainidx: size_t, al: *mut c_int,
-+ add_arg: *mut c_void) -> c_int>;
-
-+pub type SSL_custom_ext_free_cb_ex =
-+ Option<unsafe extern "C" fn(ssl: *mut ::SSL, ext_type: c_uint,
-+ context: c_uint,
-+ out: *mut *const c_uchar,
-+ add_arg: *mut c_void)>;
-+
-+pub type SSL_custom_ext_parse_cb_ex =
-+ Option<unsafe extern "C" fn(ssl: *mut ::SSL, ext_type: c_uint,
-+ context: c_uint,
-+ input: *const c_uchar,
-+ inlen: size_t, x: *mut ::X509,
-+ chainidx: size_t, al: *mut c_int,
-+ parse_arg: *mut c_void) -> c_int>;
-+
-+pub const SSL_COOKIE_LENGTH: c_int = 4096;
-+
- pub const SSL_OP_ENABLE_MIDDLEBOX_COMPAT: c_ulong = 0x00100000;
-
- pub const TLS1_3_VERSION: c_int = 0x304;
-
-+pub const SSL_EXT_TLS_ONLY: c_uint = 0x0001;
-+/* This extension is only allowed in DTLS */
-+pub const SSL_EXT_DTLS_ONLY: c_uint = 0x0002;
-+/* Some extensions may be allowed in DTLS but we don't implement them for it */
-+pub const SSL_EXT_TLS_IMPLEMENTATION_ONLY: c_uint = 0x0004;
-+/* Most extensions are not defined for SSLv3 but EXT_TYPE_renegotiate is */
-+pub const SSL_EXT_SSL3_ALLOWED: c_uint = 0x0008;
-+/* Extension is only defined for TLS1.2 and below */
-+pub const SSL_EXT_TLS1_2_AND_BELOW_ONLY: c_uint = 0x0010;
-+/* Extension is only defined for TLS1.3 and above */
-+pub const SSL_EXT_TLS1_3_ONLY: c_uint = 0x0020;
-+/* Ignore this extension during parsing if we are resuming */
-+pub const SSL_EXT_IGNORE_ON_RESUMPTION: c_uint = 0x0040;
-+pub const SSL_EXT_CLIENT_HELLO: c_uint = 0x0080;
-+/* Really means TLS1.2 or below */
-+pub const SSL_EXT_TLS1_2_SERVER_HELLO: c_uint = 0x0100;
-+pub const SSL_EXT_TLS1_3_SERVER_HELLO: c_uint = 0x0200;
-+pub const SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS: c_uint = 0x0400;
-+pub const SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST: c_uint = 0x0800;
-+pub const SSL_EXT_TLS1_3_CERTIFICATE: c_uint = 0x1000;
-+pub const SSL_EXT_TLS1_3_NEW_SESSION_TICKET: c_uint = 0x2000;
-+pub const SSL_EXT_TLS1_3_CERTIFICATE_REQUEST: c_uint = 0x4000;
-+
-+
- extern "C" {
- pub fn SSL_CTX_set_keylog_callback(ctx: *mut ::SSL_CTX, cb: SSL_CTX_keylog_cb_func);
-+ pub fn SSL_CTX_add_custom_ext(ctx: *mut ::SSL_CTX, ext_type: c_uint, context: c_uint,
-+ add_cb: SSL_custom_ext_add_cb_ex,
-+ free_cb: SSL_custom_ext_free_cb_ex,
-+ add_arg: *mut c_void,
-+ parse_cb: SSL_custom_ext_parse_cb_ex,
-+ parse_arg: *mut c_void) -> c_int;
- pub fn SSL_stateless(s: *mut ::SSL) -> c_int;
-+ pub fn SSL_CIPHER_get_handshake_digest(cipher: *const ::SSL_CIPHER) -> *const ::EVP_MD;
-+ pub fn SSL_CTX_set_stateless_cookie_generate_cb(
-+ s: *mut ::SSL_CTX,
-+ cb: Option<unsafe extern "C" fn(
-+ ssl: *mut ::SSL,
-+ cookie: *mut c_uchar,
-+ cookie_len: *mut size_t
-+ ) -> c_int>
-+ );
-+ pub fn SSL_CTX_set_stateless_cookie_verify_cb(
-+ s: *mut ::SSL_CTX,
-+ cb: Option<unsafe extern "C" fn(
-+ ssl: *mut ::SSL,
-+ cookie: *const c_uchar,
-+ cookie_len: size_t
-+ ) -> c_int>
-+ );
- }
diff --git a/dev-lang/rust/files/rust-1.27.0-libressl-2.7.0.patch b/dev-lang/rust/files/rust-1.27.0-libressl-2.7.0.patch
deleted file mode 100644
index d794284..0000000
--- a/dev-lang/rust/files/rust-1.27.0-libressl-2.7.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/vendor/libgit2-sys/libgit2/src/streams/openssl.c 2018-05-07 18:50:07 UTC
-+++ b/src/vendor/libgit2-sys/libgit2/src/streams/openssl.c
-@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void)
- ssl_opts |= SSL_OP_NO_COMPRESSION;
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- SSL_load_error_strings();
- OpenSSL_add_ssl_algorithms();
- #else
---- a/src/vendor/libgit2-sys/libgit2/src/streams/openssl.h 2018-05-07 18:50:07 UTC
-+++ b/src/vendor/libgit2-sys/libgit2/src/streams/openssl.h
-@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char *
-
-
-
--# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
-
- GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
- {
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
deleted file mode 100644
index 697c365..0000000
--- a/dev-lang/rust/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>rust@gentoo.org</email>
- <name>Rust Project</name>
- </maintainer>
- <use>
- <flag name="extended">Build and install rls, rustfmt and cargo
- alongside the compiler and stdlib</flag>
- <flag name="system-llvm">Use system <pkg>sys-devel/llvm</pkg> in
- place of the bundled one</flag>
- <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> as the
- standard memory allocator</flag>
- <flag name="wasm">Build support for the wasm32-unknown-unknown
- target</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-lang/rust/rust-1.25.0.ebuild b/dev-lang/rust/rust-1.25.0.ebuild
deleted file mode 100644
index a4369cc..0000000
--- a/dev-lang/rust/rust-1.25.0.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-LLVM_MAX_SLOT=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit llvm multiprocessing python-any-r1 versionator toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
- betaver=${PV//*beta}
- BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
- MY_P="rustc-beta"
- SLOT="beta/${PV}"
- SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
- KEYWORDS="amd64 x86"
-else
- ABI_VER="$(get_version_component_range 1-2)"
- SLOT="stable/${ABI_VER}"
- MY_P="rustc-${PV}"
- SRC="${MY_P}-src.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-case "${CHOST}" in
- armv7*)
- RUSTARCH=armv7 ;;
- arm*)
- RUSTARCH=arm ;;
- *)
- RUSTARCH=${CHOST%%-*} ;;
-esac
-case "${CHOST}" in
- armv7a-hardfloat-*)
- RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;;
- arm*)
- RUSTLIBC=${CHOST##*-} ;;
- *)
- RUSTLIBC=${ELIBC/glibc/gnu} ;;
-esac
-RUSTHOST=${RUSTARCH}-unknown-${KERNEL}-${RUSTLIBC}
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 0)).0"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
- amd64? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-x86_64-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-x86_64-unknown-linux-musl.tar.xz )
- )
- arm? (
- elibc_glibc? (
- https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-arm-unknown-linux-gnueabi.tar.xz
- https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
- )
- elibc_musl? (
- https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-arm-unknown-linux-musleabi.tar.xz
- https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-armv7-unknown-linux-musleabihf.tar.xz
- )
- )
- arm64? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-aarch64-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-aarch64-unknown-linux-musl.tar.xz )
- )
- x86? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-i686-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-i686-unknown-linux-musl.tar.xz )
- )
-"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="debug doc extended jemalloc libressl system-llvm"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- jemalloc? ( dev-libs/jemalloc )
- system-llvm? ( sys-devel/llvm )
- extended? (
- libressl? (
- >=dev-libs/libressl-2.5.0:=
- <dev-libs/libressl-2.7.0:=
- )
- !libressl? ( dev-libs/openssl:0= )
- net-libs/http-parser:0/2.8.0
- net-libs/libssh2:=
- net-misc/curl:=[ssl]
- sys-libs/zlib:=
- !dev-util/rustfmt
- !dev-util/cargo
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- || (
- >=sys-devel/gcc-4.7
- >=sys-devel/clang-3.5
- )
- !system-llvm? (
- dev-util/cmake
- dev-util/ninja
- )
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-PATCHES=(
- "${FILESDIR}/1.25.0/0001-Require-static-native-libraries-when-linking-static-.patch"
- "${FILESDIR}/1.25.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
- "${FILESDIR}/1.25.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch"
- "${FILESDIR}/1.25.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
- "${FILESDIR}/1.25.0/0005-Fix-LLVM-build.patch"
- "${FILESDIR}/1.25.0/0006-Fix-rustdoc-for-cross-targets.patch"
- "${FILESDIR}/1.25.0/0007-Add-openssl-configuration-for-musl-targets.patch"
- "${FILESDIR}/1.25.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch"
- "${FILESDIR}/1.25.0/0009-liblibc.patch"
- "${FILESDIR}/1.25.0/0010-llvm.patch"
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
- usex "$1" true false
-}
-
-pkg_setup() {
- export RUST_BACKTRACE=1
- if use system-llvm; then
- llvm_pkg_setup
- local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
-
- export LLVM_LINK_SHARED=1
- export RUSTFLAGS="$RUSTFLAGS -Lnative=$("$llvm_config" --libdir)"
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- "${WORKDIR}/rust-${RUST_STAGE0_VERSION}-${RUSTHOST}/install.sh" \
- --prefix="${WORKDIR}/stage0" \
- --components=rust-std-${RUSTHOST},rustc,cargo \
- --disable-ldconfig \
- || die
-}
-
-src_configure() {
- cat <<- EOF > "${S}"/config.toml
- [llvm]
- ninja = true
- optimize = $(toml_usex !debug)
- release-debuginfo = $(toml_usex debug)
- assertions = $(toml_usex debug)
- [build]
- build = "${RUSTHOST}"
- host = ["${RUSTHOST}"]
- target = ["${RUSTHOST}"]
- cargo = "${WORKDIR}/stage0/bin/cargo"
- rustc = "${WORKDIR}/stage0/bin/rustc"
- docs = $(toml_usex doc)
- compiler-docs = $(toml_usex doc)
- submodules = false
- python = "${EPYTHON}"
- locked-deps = true
- vendor = true
- verbose = 2
- extended = $(toml_usex extended)
- [install]
- prefix = "${EPREFIX}/usr"
- libdir = "$(get_libdir)"
- docdir = "share/doc/${P}"
- mandir = "share/${P}/man"
- [rust]
- optimize = $(toml_usex !debug)
- debuginfo = $(toml_usex debug)
- debug-assertions = $(toml_usex debug)
- use-jemalloc = $(toml_usex jemalloc)
- default-linker = "$(tc-getCC)"
- channel = "${SLOT%%/*}"
- rpath = false
- optimize-tests = $(toml_usex !debug)
- dist-src = false
- [dist]
- src-tarball = false
- [target.${RUSTHOST}]
- cc = "$(tc-getBUILD_CC)"
- cxx = "$(tc-getBUILD_CXX)"
- linker = "$(tc-getCC)"
- ar = "$(tc-getAR)"
- EOF
- use system-llvm && cat <<- EOF >> "${S}"/config.toml
- llvm-config = "$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
- EOF
-}
-
-src_compile() {
- ./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
-}
-
-src_install() {
- env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die
-
- rm "${D}/usr/$(get_libdir)/rustlib/components" || die
- rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-std-${RUSTHOST}" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rustc" || die
- rm "${D}/usr/$(get_libdir)/rustlib/rust-installer-version" || die
- rm "${D}/usr/$(get_libdir)/rustlib/uninstall.sh" || die
-
- mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
- mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
- mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
- mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
- if use doc; then
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-docs" || die
- fi
-
- if use extended; then
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-cargo" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rls-preview" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-analysis-${RUSTHOST}" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-src" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rustfmt-preview" || die
- fi
-
- rm "${D}/usr/share/doc/${P}/LICENSE-APACHE" || die
- rm "${D}/usr/share/doc/${P}/LICENSE-MIT" || die
-
- docompress "/usr/share/${P}/man"
-
- cat <<-EOF > "${T}"/50${P}
- MANPATH="/usr/share/${P}/man"
- EOF
- doenvd "${T}"/50${P}
-
- cat <<-EOF > "${T}/provider-${P}"
- /usr/bin/rustdoc
- /usr/bin/rust-gdb
- /usr/bin/rust-lldb
- EOF
- dodir /etc/env.d/rust
- insinto /etc/env.d/rust
- doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
- eselect rust update --if-unset
-
- elog "Rust installs a helper script for calling GDB and LLDB,"
- elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
- if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
- elog "install app-emacs/rust-mode to get emacs support for rust."
- fi
-
- if has_version app-editors/gvim || has_version app-editors/vim; then
- elog "install app-vim/rust-vim to get vim support for rust."
- fi
-
- if has_version 'app-shells/zsh'; then
- elog "install app-shells/rust-zshcomp to get zsh completion for rust."
- fi
-}
-
-pkg_postrm() {
- eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.26.2.ebuild b/dev-lang/rust/rust-1.26.2.ebuild
deleted file mode 100644
index dd2e42a..0000000
--- a/dev-lang/rust/rust-1.26.2.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-LLVM_MAX_SLOT=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit llvm multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
- betaver=${PV//*beta}
- BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
- MY_P="rustc-beta"
- SLOT="beta/${PV}"
- SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
- KEYWORDS=""
-else
- ABI_VER="$(get_version_component_range 1-2)"
- SLOT="stable/${ABI_VER}"
- MY_P="rustc-${PV}"
- SRC="${MY_P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
- amd64? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-x86_64-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-x86_64-unknown-linux-musl.tar.xz )
- )
- arm? (
- elibc_glibc? (
- https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-arm-unknown-linux-gnueabi.tar.xz
- https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
- )
- elibc_musl? (
- https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-arm-unknown-linux-musleabi.tar.xz
- https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-armv7-unknown-linux-musleabihf.tar.xz
- )
- )
- arm64? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-aarch64-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-aarch64-unknown-linux-musl.tar.xz )
- )
- x86? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-i686-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-i686-unknown-linux-musl.tar.xz )
- )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
- NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="debug doc extended jemalloc libressl system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- jemalloc? ( dev-libs/jemalloc )
- system-llvm? ( sys-devel/llvm )
- extended? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- net-libs/http-parser:0/2.8.0
- net-libs/libssh2:=
- net-misc/curl:=[ssl]
- sys-libs/zlib:=
- !dev-util/rustfmt
- !dev-util/cargo
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- || (
- >=sys-devel/gcc-4.7
- >=sys-devel/clang-3.5
- )
- !system-llvm? (
- dev-util/cmake
- dev-util/ninja
- )
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="!system-llvm? ( || ( ${ALL_LLVM_TARGETS[*]} ) )"
-
-PATCHES=(
- "${FILESDIR}/1.25.0/0001-Require-static-native-libraries-when-linking-static-.patch"
- "${FILESDIR}/1.26.2/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
- "${FILESDIR}/1.25.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch"
- "${FILESDIR}/1.25.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
- "${FILESDIR}/1.25.0/0005-Fix-LLVM-build.patch"
- "${FILESDIR}/1.25.0/0006-Fix-rustdoc-for-cross-targets.patch"
- "${FILESDIR}/1.25.0/0007-Add-openssl-configuration-for-musl-targets.patch"
- "${FILESDIR}/1.26.2/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch"
- "${FILESDIR}/1.25.0/0009-liblibc.patch"
- "${FILESDIR}/1.25.0/0010-llvm.patch"
- "${FILESDIR}/rust-1.26.0-libressl-2.7.0.patch"
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
- usex "$1" true false
-}
-
-rust_host() {
- case "${1}" in
- arm)
- if [[ ${1} == ${DEFAULT_ABI} ]]; then
- if [[ ${CHOST} == armv7* ]]; then
- RUSTARCH=armv7
- else
- RUSTARCH=arm
- fi
- else
- RUSTARCH=arm
- fi ;;
- amd64)
- RUSTARCH=x86_64 ;;
- arm64)
- RUSTARCH=aarch64 ;;
- x86)
- RUSTARCH=i686 ;;
- esac
- case "${1}" in
- arm)
- if [[ ${1} == ${DEFAULT_ABI} ]]; then
- if [[ ${CHOST} == armv7a-hardfloat* ]]; then
- RUSTLIBC=${ELIBC/glibc/gnu}eabihf
- else
- RUSTLIBC=${CHOST##*-}
- fi
- else
- RUSTLIBC=${ELIBC/glibc/gnu}
- fi ;;
- *)
- RUSTLIBC=${ELIBC/glibc/gnu} ;;
- esac
- RUSTHOST=${RUSTARCH}-unknown-${KERNEL}-${RUSTLIBC}
- echo "${RUSTHOST}"
-}
-
-pkg_setup() {
- export RUST_BACKTRACE=1
- if use system-llvm; then
- llvm_pkg_setup
- local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
-
- export LLVM_LINK_SHARED=1
- export RUSTFLAGS="$RUSTFLAGS -L native=$("$llvm_config" --libdir)"
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- "${WORKDIR}/rust-${RUST_STAGE0_VERSION}-$(rust_host ${ARCH})/install.sh" \
- --destdir="${WORKDIR}/stage0" \
- --prefix=/ \
- --components=rust-std-$(rust_host ${ARCH}),rustc,cargo \
- --disable-ldconfig \
- || die
-
- default
-}
-
-src_configure() {
- local rust_target="" rust_targets="" rust_target_name arch_cflags
-
- # Collect rust target names to compile standard libs for all ABIs.
- for v in $(multilib_get_enabled_abi_pairs); do
- rust_targets="${rust_targets},\"$(rust_host ${v##*.})\""
- done
- if use wasm; then
- rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
- fi
- rust_targets="${rust_targets#,}"
-
- rust_target=$(rust_host $ARCH)
-
- cat <<- EOF > "${S}"/config.toml
- [llvm]
- ninja = true
- optimize = $(toml_usex !debug)
- release-debuginfo = $(toml_usex debug)
- assertions = $(toml_usex debug)
- targets = "${LLVM_TARGETS// /;}"
- [build]
- build = "${rust_target}"
- host = ["${rust_target}"]
- target = [${rust_targets}]
- cargo = "${WORKDIR}/stage0/bin/cargo"
- rustc = "${WORKDIR}/stage0/bin/rustc"
- docs = $(toml_usex doc)
- compiler-docs = $(toml_usex doc)
- submodules = false
- python = "${EPYTHON}"
- locked-deps = true
- vendor = true
- verbose = 2
- extended = $(toml_usex extended)
- [install]
- prefix = "${EPREFIX}/usr"
- libdir = "$(get_libdir)"
- docdir = "share/doc/${P}"
- mandir = "share/${P}/man"
- [rust]
- optimize = $(toml_usex !debug)
- debuginfo = $(toml_usex debug)
- debug-assertions = $(toml_usex debug)
- use-jemalloc = $(toml_usex jemalloc)
- default-linker = "$(tc-getCC)"
- channel = "${SLOT%%/*}"
- rpath = false
- lld = $(toml_usex wasm)
- optimize-tests = $(toml_usex !debug)
- dist-src = false
- [dist]
- src-tarball = false
- EOF
-
- for v in $(multilib_get_enabled_abi_pairs); do
- rust_target=$(rust_host ${v##*.})
- arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
- cat <<- EOF >> "${S}"/config.env
- CFLAGS_${rust_target}=${arch_cflags}
- EOF
-
- cat <<- EOF >> "${S}"/config.toml
- [target.${rust_target}]
- cc = "$(tc-getBUILD_CC)"
- cxx = "$(tc-getBUILD_CXX)"
- linker = "$(tc-getCC)"
- ar = "$(tc-getAR)"
- EOF
-
- use system-llvm && cat <<- EOF >> "${S}"/config.toml
- llvm-config = "$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
- EOF
- done
-
- if use wasm; then
- cat <<- EOF >> "${S}"/config.toml
- [target.wasm32-unknown-unknown]
- linker = "lld"
- EOF
- fi
-}
-
-src_compile() {
- env $(cat "${S}"/config.env)\
- ./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
-}
-
-src_install() {
- local rust_target abi_libdir
-
- env DESTDIR="${D}" ./x.py install || die
-
- mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
- mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
- mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
- mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
- # Copy shared library versions of standard libraries for all targets
- # into the system's abi-dependent lib directories because the rust
- # installer only does so for the native ABI.
- for v in $(multilib_get_enabled_abi_pairs); do
- if [ ${v##*.} = ${DEFAULT_ABI} ]; then
- continue
- fi
- abi_libdir=$(get_abi_LIBDIR ${v##*.})
- rust_target=$(rust_host ${v##*.})
- mkdir -p "${D}/usr/${abi_libdir}"
- cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
- "${D}/usr/${abi_libdir}" || die
- done
-
- rm "${D}/usr/$(get_libdir)/rustlib/components" || die
- rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-std-$(rust_host ${ARCH})" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rustc" || die
- rm "${D}/usr/$(get_libdir)/rustlib/rust-installer-version" || die
- rm "${D}/usr/$(get_libdir)/rustlib/uninstall.sh" || die
-
- if use doc; then
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-docs" || die
- fi
-
- if use extended; then
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-cargo" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rls-preview" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-analysis-$(rust_host ${ARCH})" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-src" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rustfmt-preview" || die
-
- rm "${D}/usr/share/doc/${P}/LICENSE-APACHE.old" || die
- rm "${D}/usr/share/doc/${P}/LICENSE-MIT.old" || die
- fi
-
- rm "${D}/usr/share/doc/${P}/LICENSE-APACHE" || die
- rm "${D}/usr/share/doc/${P}/LICENSE-MIT" || die
-
- docompress "/usr/share/${P}/man"
-
- cat <<-EOF > "${T}"/50${P}
- MANPATH="/usr/share/${P}/man"
- EOF
- doenvd "${T}"/50${P}
-
- cat <<-EOF > "${T}/provider-${P}"
- /usr/bin/rustdoc
- /usr/bin/rust-gdb
- /usr/bin/rust-lldb
- EOF
- dodir /etc/env.d/rust
- insinto /etc/env.d/rust
- doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
- eselect rust update --if-unset
-
- elog "Rust installs a helper script for calling GDB and LLDB,"
- elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
- if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
- elog "install app-emacs/rust-mode to get emacs support for rust."
- fi
-
- if has_version app-editors/gvim || has_version app-editors/vim; then
- elog "install app-vim/rust-vim to get vim support for rust."
- fi
-
- if has_version 'app-shells/zsh'; then
- elog "install app-shells/rust-zshcomp to get zsh completion for rust."
- fi
-}
-
-pkg_postrm() {
- eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.27.0.ebuild b/dev-lang/rust/rust-1.27.0.ebuild
deleted file mode 100644
index 76250a1..0000000
--- a/dev-lang/rust/rust-1.27.0.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-LLVM_MAX_SLOT=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit llvm multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
- betaver=${PV//*beta}
- BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
- MY_P="rustc-beta"
- SLOT="beta/${PV}"
- SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
- KEYWORDS=""
-else
- ABI_VER="$(get_version_component_range 1-2)"
- SLOT="stable/${ABI_VER}"
- MY_P="rustc-${PV}"
- SRC="${MY_P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
-
-# there is no cargo 0.28 tag, so use 0.27
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2))).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
- amd64? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-x86_64-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-x86_64-unknown-linux-musl.tar.xz )
- )
- arm? (
- elibc_glibc? (
- https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-arm-unknown-linux-gnueabi.tar.xz
- https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
- )
- elibc_musl? (
- https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-arm-unknown-linux-musleabi.tar.xz
- https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-armv7-unknown-linux-musleabihf.tar.xz
- )
- )
- arm64? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-aarch64-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-aarch64-unknown-linux-musl.tar.xz )
- )
- x86? (
- elibc_glibc? ( https://static.rust-lang.org/dist/rust-${RUST_STAGE0_VERSION}-i686-unknown-linux-gnu.tar.xz )
- elibc_musl? ( https://portage.smaeul.xyz/distfiles/rust-${RUST_STAGE0_VERSION}-i686-unknown-linux-musl.tar.xz )
- )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
- NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="debug doc extended jemalloc libressl system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
- jemalloc? ( dev-libs/jemalloc )
- system-llvm? ( sys-devel/llvm )
- extended? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- net-libs/http-parser:0/2.8.0
- net-libs/libssh2:=
- net-misc/curl:=[ssl]
- sys-libs/zlib:=
- !dev-util/rustfmt
- !dev-util/cargo
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- || (
- >=sys-devel/gcc-4.7
- >=sys-devel/clang-3.5
- )
- !system-llvm? (
- dev-util/cmake
- dev-util/ninja
- )
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="!system-llvm? ( || ( ${ALL_LLVM_TARGETS[*]} ) )"
-
-PATCHES=(
- "${FILESDIR}/1.25.0/0001-Require-static-native-libraries-when-linking-static-.patch"
- "${FILESDIR}/1.27.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
- "${FILESDIR}/1.27.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch"
- "${FILESDIR}/1.25.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
- "${FILESDIR}/1.25.0/0005-Fix-LLVM-build.patch"
- "${FILESDIR}/1.25.0/0006-Fix-rustdoc-for-cross-targets.patch"
- "${FILESDIR}/1.25.0/0007-Add-openssl-configuration-for-musl-targets.patch"
- "${FILESDIR}/1.26.2/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch"
- "${FILESDIR}/1.25.0/0009-liblibc.patch"
- "${FILESDIR}/1.25.0/0010-llvm.patch"
- "${FILESDIR}/rust-1.27.0-libressl-2.7.0.patch"
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
- usex "$1" true false
-}
-
-rust_host() {
- case "${1}" in
- arm)
- if [[ ${1} == ${DEFAULT_ABI} ]]; then
- if [[ ${CHOST} == armv7* ]]; then
- RUSTARCH=armv7
- else
- RUSTARCH=arm
- fi
- else
- RUSTARCH=arm
- fi ;;
- amd64)
- RUSTARCH=x86_64 ;;
- arm64)
- RUSTARCH=aarch64 ;;
- x86)
- RUSTARCH=i686 ;;
- esac
- case "${1}" in
- arm)
- if [[ ${1} == ${DEFAULT_ABI} ]]; then
- if [[ ${CHOST} == armv7a-hardfloat* ]]; then
- RUSTLIBC=${ELIBC/glibc/gnu}eabihf
- else
- RUSTLIBC=${CHOST##*-}
- fi
- else
- RUSTLIBC=${ELIBC/glibc/gnu}
- fi ;;
- *)
- RUSTLIBC=${ELIBC/glibc/gnu} ;;
- esac
- RUSTHOST=${RUSTARCH}-unknown-${KERNEL}-${RUSTLIBC}
- echo "${RUSTHOST}"
-}
-
-pkg_setup() {
- export RUST_BACKTRACE=1
- if use system-llvm; then
- llvm_pkg_setup
- local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
-
- export LLVM_LINK_SHARED=1
- export RUSTFLAGS="$RUSTFLAGS -L native=$("$llvm_config" --libdir)"
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- "${WORKDIR}/rust-${RUST_STAGE0_VERSION}-$(rust_host ${ARCH})/install.sh" \
- --destdir="${WORKDIR}/stage0" \
- --prefix=/ \
- --components=rust-std-$(rust_host ${ARCH}),rustc,cargo \
- --disable-ldconfig \
- || die
-
- default
-}
-
-src_configure() {
- local rust_target="" rust_targets="" rust_target_name arch_cflags
-
- # Collect rust target names to compile standard libs for all ABIs.
- for v in $(multilib_get_enabled_abi_pairs); do
- rust_targets="${rust_targets},\"$(rust_host ${v##*.})\""
- done
- if use wasm; then
- rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
- fi
- rust_targets="${rust_targets#,}"
-
- rust_target=$(rust_host $ARCH)
-
- cat <<- EOF > "${S}"/config.toml
- [llvm]
- ninja = true
- optimize = $(toml_usex !debug)
- release-debuginfo = $(toml_usex debug)
- assertions = $(toml_usex debug)
- targets = "${LLVM_TARGETS// /;}"
- [build]
- build = "${rust_target}"
- host = ["${rust_target}"]
- target = [${rust_targets}]
- cargo = "${WORKDIR}/stage0/bin/cargo"
- rustc = "${WORKDIR}/stage0/bin/rustc"
- docs = $(toml_usex doc)
- compiler-docs = $(toml_usex doc)
- submodules = false
- python = "${EPYTHON}"
- locked-deps = true
- vendor = true
- verbose = 2
- extended = $(toml_usex extended)
- [install]
- prefix = "${EPREFIX}/usr"
- libdir = "$(get_libdir)"
- docdir = "share/doc/${P}"
- mandir = "share/${P}/man"
- [rust]
- optimize = $(toml_usex !debug)
- debuginfo = $(toml_usex debug)
- debug-assertions = $(toml_usex debug)
- use-jemalloc = $(toml_usex jemalloc)
- default-linker = "$(tc-getCC)"
- channel = "${SLOT%%/*}"
- rpath = false
- lld = $(toml_usex wasm)
- optimize-tests = $(toml_usex !debug)
- dist-src = false
- [dist]
- src-tarball = false
- EOF
-
- for v in $(multilib_get_enabled_abi_pairs); do
- rust_target=$(rust_host ${v##*.})
- arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
- cat <<- EOF >> "${S}"/config.env
- CFLAGS_${rust_target}=${arch_cflags}
- EOF
-
- cat <<- EOF >> "${S}"/config.toml
- [target.${rust_target}]
- cc = "$(tc-getBUILD_CC)"
- cxx = "$(tc-getBUILD_CXX)"
- linker = "$(tc-getCC)"
- ar = "$(tc-getAR)"
- EOF
-
- use system-llvm && cat <<- EOF >> "${S}"/config.toml
- llvm-config = "$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
- EOF
- done
-
- if use wasm; then
- cat <<- EOF >> "${S}"/config.toml
- [target.wasm32-unknown-unknown]
- linker = "lld"
- EOF
- fi
-}
-
-src_compile() {
- env $(cat "${S}"/config.env)\
- ./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
-}
-
-src_install() {
- local rust_target abi_libdir
-
- env DESTDIR="${D}" ./x.py install || die
-
- mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
- mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
- mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
- mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
- # Copy shared library versions of standard libraries for all targets
- # into the system's abi-dependent lib directories because the rust
- # installer only does so for the native ABI.
- for v in $(multilib_get_enabled_abi_pairs); do
- if [ ${v##*.} = ${DEFAULT_ABI} ]; then
- continue
- fi
- abi_libdir=$(get_abi_LIBDIR ${v##*.})
- rust_target=$(rust_host ${v##*.})
- mkdir -p "${D}/usr/${abi_libdir}"
- cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
- "${D}/usr/${abi_libdir}" || die
- done
-
- rm "${D}/usr/$(get_libdir)/rustlib/components" || die
- rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-std-$(rust_host ${ARCH})" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rustc" || die
- rm "${D}/usr/$(get_libdir)/rustlib/rust-installer-version" || die
- rm "${D}/usr/$(get_libdir)/rustlib/uninstall.sh" || die
-
- if use doc; then
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-docs" || die
- fi
-
- if use extended; then
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-cargo" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rls-preview" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-analysis-$(rust_host ${ARCH})" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rust-src" || die
- rm "${D}/usr/$(get_libdir)/rustlib/manifest-rustfmt-preview" || die
-
- rm "${D}/usr/share/doc/${P}/LICENSE-APACHE.old" || die
- rm "${D}/usr/share/doc/${P}/LICENSE-MIT.old" || die
- fi
-
- rm "${D}/usr/share/doc/${P}/LICENSE-APACHE" || die
- rm "${D}/usr/share/doc/${P}/LICENSE-MIT" || die
-
- docompress "/usr/share/${P}/man"
-
- cat <<-EOF > "${T}"/50${P}
- MANPATH="/usr/share/${P}/man"
- EOF
- doenvd "${T}"/50${P}
-
- cat <<-EOF > "${T}/provider-${P}"
- /usr/bin/rustdoc
- /usr/bin/rust-gdb
- /usr/bin/rust-lldb
- EOF
- dodir /etc/env.d/rust
- insinto /etc/env.d/rust
- doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
- eselect rust update --if-unset
-
- elog "Rust installs a helper script for calling GDB and LLDB,"
- elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
- if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
- elog "install app-emacs/rust-mode to get emacs support for rust."
- fi
-
- if has_version app-editors/gvim || has_version app-editors/vim; then
- elog "install app-vim/rust-vim to get vim support for rust."
- fi
-
- if has_version 'app-shells/zsh'; then
- elog "install app-shells/rust-zshcomp to get zsh completion for rust."
- fi
-}
-
-pkg_postrm() {
- eselect rust unset --if-invalid
-}