diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2018-12-29 14:19:55 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2018-12-29 14:19:55 -0500 |
| commit | b942bdbb128e2a597de7270c19576f1fd9373900 (patch) | |
| tree | 9fb60bbf4db68aaea20847b5df53c25c2b4c5248 | |
| parent | dev-python/numpy: in tree version works (diff) | |
| download | musl-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>
28 files changed, 0 insertions, 4008 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest deleted file mode 100644 index acb4a667..00000000 --- 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 d307a953..00000000 --- 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 6b50eda3..00000000 --- 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 26ecebf9..00000000 --- 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 7e992b58..00000000 --- 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 ddef113e..00000000 --- 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 af86047a..00000000 --- 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 8ee65a99..00000000 --- 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 5a69455b..00000000 --- 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 f7867ac0..00000000 --- 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 3f9f4091..00000000 --- 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 53de5675..00000000 --- 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 99e992a8..00000000 --- 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 bd637734..00000000 --- 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 f0b4b746..00000000 --- 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 190ad0cd..00000000 --- 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 d794284e..00000000 --- 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 697c365b..00000000 --- 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 a4369cc3..00000000 --- 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 dd2e42ab..00000000 --- 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 76250a1e..00000000 --- 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 -} diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest deleted file mode 100644 index 0f128f1d..00000000 --- a/dev-util/cargo/Manifest +++ /dev/null @@ -1,219 +0,0 @@ -DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31 -DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65 -DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa -DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b -DIST atty-0.2.8.crate 5708 BLAKE2B e88f1155f51dd36eb38364994eeffc84683b43b8010909e058d9fd80fa492092ed49d6d05b5b7d10fd2585191dd1b6efdccf30be298f53dcb832027fd6187508 SHA512 d6aac03499b5e8187ecacd6060d34d3ad8747eb680c9f59ba13e00253d422b2d7d092236fc8eced93358f251d46672013463e3bfdc0aaa9e9e7c5c8e08a22195 -DIST atty-0.2.9.crate 5898 BLAKE2B fa8b45e670fc4147f0407e4a059569e3d4ec31f79aef01ef581c03396a73aa449482dba200bf49d6f60887853eadc8ccf483c0fa0ebcba9f219557cee9a907ba SHA512 2d7d2e52f3d3b66d4280dc3a2509c0125b1cf7dc136f3cc81e1a91aee0dcebdb4444544f631bccf299580f24ac8687f9b61e3b08fc961c040146959eeec1205c -DIST backtrace-0.3.5.crate 27636 BLAKE2B db71be18b39a7aa25d2e1850fd907d3ea96d30af66b72c7b2b12a37acf6d6f46cdca1b9de884167e7567584848ea2ca4a1b03468e9158a62a3fde6aacd0746c8 SHA512 b554fd616780c706d8f6e7afef4800625a9fec5f7825e995a534103d1b773f0f28e09d49a1163eef9059681d669953ed1b7a8fb33209ee3b7be1fdeaa2adb3a1 -DIST backtrace-0.3.6.crate 28437 BLAKE2B 63f056086b8c56707e7a3f9719e211a70368584c85a6a3b05ed8ad31cf3ac86f6fc091c826392439fcaf9a0f4066de8da00449a9715d90c1585d450fff63bbdd SHA512 c42e9891a2297aefa08e6ec627520bfd3f93f7eddc2782cb5eb277092d588b1d84e75ac724d29548eab77de19de3400748b90bf2eccfed5ce1e20a979dd210e6 -DIST backtrace-0.3.7.crate 28432 BLAKE2B 5478adb8e5a028a5d5af62b2f6522c2a7bee65bcbfa76da252c57e4f17b682db486f3aff96501d49943d86567eb8187f1e37a42f324b3cf3181788d0cd760b15 SHA512 a3f0d8bfef2158310c65f41e246323b0953147a017dbe47143b8dc2e1734c945f13b49732a16f1712a3b5a27a23f27a38778d8185c64a7982948aace69c079af -DIST backtrace-sys-0.1.16.crate 283418 BLAKE2B d15f9c692dd805c61dbd219c70f0b47bb6d2a18bdb2657bd5b5bf6f94f1df621f6be56e2774d2d5d218f044c1358b1af4251705123c5d48ce5575ff3a2f3b50a SHA512 2fd32fee7c13d1c83be5e86341a4c1c0da06876a73a9fb74c680994132510eac9a3444144c97ddcb78919da044e628650d604a20a06ca7852289168da8d754b4 -DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0 -DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465 -DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8 -DIST bufstream-0.1.3.crate 8375 BLAKE2B 6e64cfb797283f935ccf309fc054eda4c362fc482b68360619b1146698a0db5023013ded3f1c64ecfa29b55f10dcb8c230d853f5088f28da9ea1c018147d9247 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1 -DIST cargo-0.26.0-aarch64-unknown-linux-gnu.tar.xz 3060104 BLAKE2B f82d0fd5439169a0027daa406fadddc381deb35fdf806e2f9753dbd0b716b14e1a0dcc91ed036154ad36a4b42827e80bb431bcd038782386026e695075eb6f66 SHA512 b3b53bb1ab5bb6f04149667f1592f3e5b4c79c228f3b4db071507ab4b928f6990a0b4055b57ffcf1fc788f48209513dbfe4943b1620f1e1b60e770e434e03287 -DIST cargo-0.26.0-aarch64-unknown-linux-musl.tar.xz 3395028 BLAKE2B 83a94454b87993f6c1ede8c7f53122f762d45fbab6aab02994e7ddb55e7851c04fc904d15d6ceb9f89b1a7839eb932a4c5a87601c1aba1a8be11cad53e3e838c SHA512 4f09d0a301c84eb0e29102ce6ce8f46b7a5929a4399b14a257fbb5265416503504d656c14acea357b1cd5ef527e452991afdc154b279ec030bc05eb285f015c8 -DIST cargo-0.26.0-arm-unknown-linux-gnueabi.tar.xz 3670620 BLAKE2B 7f437a84bdbed165d17d6fde0c26ea0576512aaac40f5b087c336adb8324cbb119c3d822cdc0768981acba654c354381ec73cd8104822e9a7e2627bc7851ff09 SHA512 e823c02e20a6c19863d08792bea151b46acc533f1bb2823ba6a73127940fdd77f3e5f6542ee170cd0f70216fbbaf7029f91887da512b81fc343a55b646973d52 -DIST cargo-0.26.0-arm-unknown-linux-musleabi.tar.xz 3440572 BLAKE2B eb5e5d5785cc5c661fc1d70ead18e3df6fdadbc371c302bb6d2054432c36c5f0ec7f3cd4b1883dbebce4871f1b05100e350fc6e3009792d32dd9b3433429413c SHA512 431fc53dbe23f86953fe1894448f79745acb399c42bf91834fb69b524d3c255edde8a320237d8f01497ea3b53a174cea809db4520782b521110124cfe10c7e39 -DIST cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.xz 3694064 BLAKE2B 3ec8596000d2b0818e4803c93361d7a82b136a5d00c29577c951ebc73df9145d68bc0b055efd71eb9932934e132baaa0648a3493c53b6627553ae3c645f58022 SHA512 8a80f50b46b37cf1a8a90fe4841c7ef27e81791e533712fcdd8b35250c17db6199689337713667399cfff10c40b847f48466bf145b58be7a54f794e3f6b34800 -DIST cargo-0.26.0-armv7-unknown-linux-musleabihf.tar.xz 3453148 BLAKE2B fd6c7a54373dfd814a32116190a2307440cc145331c95d53a8e7d1caa34f9ef8a826cd3bf586b77aa0b53f05a36e7369463ba396214f26a023d2ca9746290f89 SHA512 0dd9fedf5fb5148a4fdbdd1a124ff13fa06d6a6f02ec6392be019df4e09f81036bd6639fba2583f9c2ae4b9d8c8177e98742466cdafab5d01bc1b2c567119e9f -DIST cargo-0.26.0-i686-unknown-linux-gnu.tar.xz 4104468 BLAKE2B 1325a2b0c4da3c4788e04f8d61f938fd7690ff031891f89d29d74f5a1c43425d4ade0b306309205782ae8624733b8f365ca033052ba95aeee730a69900a4ab3d SHA512 4e30b8091123af894493e8c704723945abaec21befabf54ba3d618d8c6586352ce02501afc0229494f99b7612b82e049fb5c35ac419282349673394c75a2c6d7 -DIST cargo-0.26.0-i686-unknown-linux-musl.tar.xz 3951224 BLAKE2B 2d2189e7c18bfdff31a1dd722fe7d4d7b7e3105457bc92dab6b4b3ab171bfcb60c6f6a88c8766a3bae66f9d8c5bea284c3579fc86df72474f66b2ae439436b18 SHA512 258587083addb256d1306d19780c08d2c4484b67741edd366212ba1433dac3c65b926e751dbeace39dca9d377886212db75c5cf88ef6f5fede934992f735519d -DIST cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz 4134388 BLAKE2B 961df201fa4f87308a28b217296c7927e6b67f513e7eaaf5cf12675ab4c01c50e60bf8756c2f8fafe1e4b2d7e3e5a8daa446fc1b72014828d0233209434f1dda SHA512 476041cb12a49819250d96f246d900769ab83386e584b3264b4f47ef5a2182d410a8606054a330da653cf2b2a290193c7260af5c98a29d6969b6c7c5169876ee -DIST cargo-0.26.0-x86_64-unknown-linux-musl.tar.xz 3869132 BLAKE2B 9647b50bcfadce9b1b86e2ae79b05f9c371f49d5277f6bf2fc089c35deb4274156e134e479e78154005549356c420d27d2b73802a5f5bc44dd86452c78fb1a94 SHA512 01e401b8bbd9f9bc0df317032de4b019e8a3cbcd64d4b9b8d54174588d1b0c956b823916aaa2251f48b716c42167694bcef1599069c84c0bce16fa1eed548278 -DIST cargo-0.26.0.tar.gz 698823 BLAKE2B a16b69818c029d9e2f6a704d6c5875d2cd01d4c120b9df18c9e33df56009c58870e7f48a0a3709dabbcc88b535a0762fca3ab11069e4ba2506566f89e8773533 SHA512 0ceba204f6effb0b636b8a4cab38ae876e32d548a158cc2a67f3f80f144d4a05ce5ec44df74eb7e17a3dcd57105298dae1ac599b917c0dbb4b7386d3cf424070 -DIST cargo-0.27.0-aarch64-unknown-linux-gnu.tar.xz 3447968 BLAKE2B 69ae05955214d37e05d62348cb006dadff258f600e3ba89c2d185c59c144486c7987eb154330dd203963c8d7761d8a74b8c41545eaed99761e7115ff5d19e345 SHA512 ba04d3c52ffbfc89bc92e17c6f850bd64335e15aedb4c884ea5a19fb6e2395d8054d3678b6e13d81903bc85a3ddd38bec3561266de783bc0f920f2d76c2834a5 -DIST cargo-0.27.0-aarch64-unknown-linux-musl.tar.xz 3457764 BLAKE2B 7c05d4a44110edeee92d93ba42778a362a3f9dc032e8072fc614f3dd2a2815223c6ad9b4a5bf8a76ee55cb918e49598edb0be913f95ec45005eb0a9d5b5639b5 SHA512 de52796e3aaf2fb76ff602bb8ca6f57127712c8d9d92384b857b530ad29946691f810fdb254568bf0af2a79467e7e3cee60406e2aabc05f3505bb3a834f7a9c5 -DIST cargo-0.27.0-arm-unknown-linux-gnueabi.tar.xz 4026932 BLAKE2B 4a7265f400675b671e94dd3e271621dddfaead6167ff659426afdcab18295286882105c548a31182b2753c91e0ae4c004c2952a6715883c2fc8893679e6785cc SHA512 e40ea55556bf901ab24df116c726298daa4d8cf734a39dc515ad3f0b93573b1200a4c8407dfc60365310ccb95b364c74f5b212f8840aae571d6766aca89f9cc8 -DIST cargo-0.27.0-arm-unknown-linux-musleabi.tar.xz 3496144 BLAKE2B c73a4d09a2b00fb66ff430ac5aab41aefc6a7fe6093823b900c73ec2541951b36a0c2db187892217c00f01ea0ef45a988bc3907748b578ce0908ee4d9a576736 SHA512 70888207b5e16bdc1804b6e1722a6405ddd0cab22060c018ebb1ba8234ed92312b789e4b7d75e2e3fcf4ba18e21c7967e1ced39a361735bf9a2323e6816fe98b -DIST cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.xz 4059300 BLAKE2B 2cc0aeca591b7dc16357d5210d18efcaff7e812ac72976dd1dfb0da97463b9ad3447080fa0fc81387023c6d74130a6cfe509f6a02b38532452a9834ff8219d3c SHA512 689ebba97c27dff1a0e9fc41d24c4534f01cb98b29c5967dce365717daed406407ced7b7d85884c214d25f5a5ab9c0882c59709397b32afce0b6e66c1f9fdace -DIST cargo-0.27.0-armv7-unknown-linux-musleabihf.tar.xz 3479432 BLAKE2B 8a9c7b95c8e50deed8b6471f570082d6dcb06c6f0c8ca764056c7605bab8e02d6991d8ebf8992fc406f20cbb85f0c8ee6628f8901c2ff5df69d74c2859964362 SHA512 b0c5866d3a9c36c7cc3cdf3efc98e456191fa82edc3e2bad385566c5cc86c55432b9f0e2aa1485e6573119f845e1101d585fb9b329b8394716c553edc23e5f64 -DIST cargo-0.27.0-i686-unknown-linux-gnu.tar.xz 4570084 BLAKE2B 9f62bcf03d8eefdc5681929fce4f7835ba5c4181324fcb43d2594cf61bd2e460496380abd8da37df0b2977a02e3c027a436297f06b6ca28da82e6b540df9f35a SHA512 212d5634e369c913612a2023cd0d1b81f4f1d8f37e504a07ce855573a6dd0fb2084ec9a0e00a86b457adb7e08b46215f73ede9222ad01213e4c9e5a4ff99cca9 -DIST cargo-0.27.0-i686-unknown-linux-musl.tar.xz 4015296 BLAKE2B 1ec166ba267546057da2431335026ca6349ab1823ee4250153d85ea412b70a480b0692330ad2a3bca320f2dc06973ea6a3a7559ae4c5d19c09e9ed853f40ded1 SHA512 146bc4793e34a478723ad1260c132ea8f6a8271b03e20d092e026b116d2aa32a075c3a1e1bf7c11106c3a72137bb9fb0c51a8ad70973702ae52d8b1239e2e849 -DIST cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz 4524080 BLAKE2B e2a65dafed7ce552f6fbf8b641409cd6fcd924c10e0779c7587fae5c3cba23626f7913cab3b8741d9bc9aac471c855e32b8647769a3750baee1d377031e9eb9b SHA512 c0609edeaebd3e851c94933b3e5c56e8fd394c5b3a572bdacdf32dba5a2de9bdf6468879017f97002bea990c1ec1a970e017d1cf2fbcb22f6cf1ac39dbd1d947 -DIST cargo-0.27.0-x86_64-unknown-linux-musl.tar.xz 4045136 BLAKE2B 58b168fbae0286daa0929b2dfeabb8914bacac82b24ded57a55e0dc40fcb2e11bac45bde824a92e4dc70e5d8f6c667e71cf04ff1ecbc14f732a7270ddf503298 SHA512 c2f4f343bb12f53aaabf509b7f9f98bc9799feb297e71e729206f1d584433acd88e3febc1de9706adf8c1534eaee9942e03e7803b4065827b16dac3484d25f92 -DIST cargo-0.27.0.tar.gz 728885 BLAKE2B 1966e381b9c286786f8b28257f155d2a10d23727978f4f0a1954294c1b82ab0d2aecd511a72e39f9c6fe955bb237cee4e53f8542270eee8c2eea3cb7dc956fda SHA512 8b984a1a64427d09d29ed82cc736abb0a2e936a253ef3ec05b4934b2b541758bd4e3c68ca21c80649de83eac2742f84f2c81f29fe62d85a150ad0cf2c50a990e -DIST cargo-0.28.0-aarch64-unknown-linux-gnu.tar.xz 3631020 BLAKE2B c4e9f3b560da8b7dc7b3a89d522d96ef901270f1814715b8642a6666f252cb403ee48118726161eb8b5b34a44857813c381bd5de7f288bba8a8786311ec60b2d SHA512 b182cceb8fe26e6dac18c19c765fdbf0eca2988c841357f5565d792b3256c2a9aa2bda3a574aee8a3524a8a26c6ad3efeb5562bb584babdc083cff5f1607cae0 -DIST cargo-0.28.0-aarch64-unknown-linux-musl.tar.xz 3673860 BLAKE2B 99eb01876d41a9843b64b060fc4405cfb12c7599e78accb7ae85be01e76f8e7b9c34c0834b2042110cc78ca2225add95a6800fc1f93dd421ef819f997f443f2e SHA512 b6b79d56f3e29fe64ce9023c7d96bc6d5c02705d50b6ada048df7bedd7dfa64bfd9b489ec3dd5e3c48228870e4af41413db8f5a2dedf4bd98569692170a3c4d9 -DIST cargo-0.28.0-arm-unknown-linux-gnueabi.tar.xz 4239020 BLAKE2B 5d43315694c06b6367b23305bb7a6d9c2cecd7ed539c75fbc6e0a582207cc479de257551a152414b460d2839e230042ed5476e4f6176e48e669b9d45572c9865 SHA512 5cc8878927c763ea7047069afcefe218938b276d35048eb0d9d28ec2e2dd78233b9e8f10ec09750ee66dc72b9876092f7228f64f6aab9acd3e7ad9c9971e7726 -DIST cargo-0.28.0-arm-unknown-linux-musleabi.tar.xz 3751732 BLAKE2B bd3201c18cc8c164ef9a06f9888f12d9ff7eeb76ac88522864b187b2def3e867545e9373d31407c6ed8a85c7e7bc397c18755f617ce91acb73adb69481f96a5b SHA512 07843d70fcca099ffc50fd32c521d50bcd75a3bee71fbfc7b57f560df56d9fdf67d38352459c45a7a15cae13402dfdd4fd0cd941f746a68cbb3fb857d613920c -DIST cargo-0.28.0-armv7-unknown-linux-gnueabihf.tar.xz 4236652 BLAKE2B 6a9ba9818b483f30519d543137f937e18700318ed04b584cc805b59761d687c6e2db5deac5e68512075c6dcf9abd0c1fe5ed5b28d083b05c75547d639d4284f3 SHA512 e6c338268915b1e9486de9ad4db2ffcd672e234b2e39b52b72f6a0dbf4277b03da6ae07f8340affdaf0e35bc19b91e3eb9b7c175b169bdb7ba1f8be2328a01ac -DIST cargo-0.28.0-armv7-unknown-linux-musleabihf.tar.xz 3697832 BLAKE2B 5a73eb338d28d8e654d9d09cb4ee8b16f44c8a1b3714f0387eb11d360a92e08c5e45056abda9a9ce71f2cfc734fbc65e6fa425fc3a3e49b5685a14dd5ab93553 SHA512 c88b13db6b9119a77137b114e52b3d1bf4c1e01a6e4d3a57cfc1e3beae10b90945ed1024a163d77b2d3de7c87245070b11da6367232999cc675e751797af779a -DIST cargo-0.28.0-i686-unknown-linux-gnu.tar.xz 4779044 BLAKE2B 01f3d1c6a4fd939ef09b4cdb6faaf6301a3c3fa962c7564c34bb7f9b928f8abed31558b41b7df5d5efc0bc7398ed14e5a2549decdd38675d4c943d1a5f56da01 SHA512 9c3076d8fa5369cc68cb72dc8d2812e33ed73d07a43373c2a849625cc7f78f03455ca256dbc109280df7974e40824047afc8d3bb92bf60fd865b20d7e4a5b17f -DIST cargo-0.28.0-i686-unknown-linux-musl.tar.xz 4282464 BLAKE2B 94365ac91429427d76fd2b3f989b676c92494e0c764d848d17e5990ece71a3652683ef66d573ec982373f8c771cf90ac425a11adcf7d5803b52f813b05b0eaef SHA512 1c115c0bc3f83d3e85347256f033842bc2c126a2845115c53186f114ff69f4f137c920082ce0a21cd2d3269fb5cea055be2ea490e93f75907fdaae8dd81b4251 -DIST cargo-0.28.0-x86_64-unknown-linux-gnu.tar.xz 4750004 BLAKE2B 85359ff22aabe84690e65cd97eb497fd72688d6151a03b9818b1f80b0891f9629b8402bdc30d3cf287473895e1e1357d8febaff633827463d11918700c991545 SHA512 68759b1037cc4dec33750bd3152ac508592f11aaa62609592ded7ca0e79e701254e2f7cd12c827b1638266ef925fe8bc7cede0e325345eb518bf2dff708699a6 -DIST cargo-0.28.0-x86_64-unknown-linux-musl.tar.xz 4325948 BLAKE2B 3d0588498abe5ac7a551eb738e6099b4ccb7144b4fabd51a87d14797a7d108036f29b9994f8f690632eee68480a580a72895b8014885ae84f6ce7ec63372d04d SHA512 65dd19533f75e945b17d5f960245c481897ca138740e4cfec9e905cd7e7670388aa011c97e2decec71adce8a628547c67a0b42b703e50fb671571ced10a46557 -DIST cargo-0.28.0.crate 754146 BLAKE2B 4684dba85e40a3d2bbe13ea18f01c101c4783e132d302897dc95bb89adb0193b24ddca108e1886e8b2f7f292bc94f95826d479ac4daa963ef26db789cc6a039f SHA512 149b721ec91600e201162403773b22bb1c3f1c825c506a4665396e681864e953c3acf53eea0ab319a7932bb06fe0f5d02e82a54d39f6a0fa23798aee93469540 -DIST cargo-0.28.0.tar.gz 761690 BLAKE2B 0dec2524053ce56013108f031e57b7b8c69daa95f4d594fa7a849e91dc317e07ea0540c322c7473242640567c0bf9f565661e9bf91ee8b96008986c9a1e2fd89 SHA512 609ce0b7539511e5dc9f5d426c761dc074406cc3f2f4b4a8bd4b1f01dbd5288b33403b64b2078e5f5ef1cf40d468468099bfab24af751bb5b4d4912cd5f72030 -DIST cc-1.0.10.crate 41311 BLAKE2B 30dc4dc3efa8f2143341a7519c9a6a46b7987faed78b55b338bafac4f7550ac3534f5c876e174a938916d621435396a2066e001794f49d1e59be1e3815605d76 SHA512 b1f492cf2ab1b31ca11524703f02148a16bf54e57a05f2d988dea8b8f75c9e997b8c6ea6569ac9a47dbf0569adcc23b61db1537a0c6e7957fd736c64b9fb4ed3 -DIST cc-1.0.15.crate 41839 BLAKE2B a00d432720c168b0d69fc7d321d3abec3e18662c6e0c44e6092482e7215dc51688b1f01888150f060e57c88f3003e58b5f8985f1dd31731bb259921bd7a45d9f SHA512 220b88ad675b076b6fc322253f4f8de641fb2c3b27814a3fa5fdc2f79c52e93f2de4e6fc176a6d3a0b7a9fff46d9bd2d4396310cfde4a68f7082224510a9a831 -DIST cc-1.0.9.crate 41193 BLAKE2B 15643c05698e5e9cfb955495db401b11a28c0047fd35945d17ba4656d44551b73451b8c4399cb1338311228c4fa059318c55e3f59dc0ecae2374ba1b577a8d45 SHA512 7423164d85ac2d57782b6f259ea7e7e581fd8ecb7f3cfe4f8767c05caaf6e25d8cd73031123b60f0df96b2cd4c265d92a66933b7aaef4aae998cdc0e179618f4 -DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa -DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d -DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127 -DIST cmake-0.1.30.crate 12477 BLAKE2B 23529899687c844e3d0e864272d964d5d4ea1900afbee9e4c323a4712fe9341378f41667463cd3b9e6944bc56c123c6331161e25e8816143a8efc3109164e14b SHA512 c27e7b6e50e77409f1e7481a88839e2de64ce6d94345cd955e9b3ff6f5720a090f02adcc1067113471cd48125b236952c0177920be7e03cf15bf2baa323788b1 -DIST cmake-0.1.31.crate 12480 BLAKE2B a861b9481636ab9ecdcdfa13d599cd081924394fc60268e7baec36ba875e7c61a7ceee423fb97e44a1aa28db005f1ed3f855a8490dcfbcf86f6e637445a9468c SHA512 72523416f52e253fc4d5ab9b4fbf56cf6870ec21d71199c7dbe9c0ea09fd32a226c5eb5677347b32f8e82b40b9335ddbbe77a08ea8fa2c4f0db5f3cb5e6f319a -DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85 -DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e -DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2 -DIST core-foundation-sys-0.5.1.crate 15974 BLAKE2B 5065520f9d7661523edd7018e77d43346f39bcdef407ffe7bafbdec019e39389118b90a11599d5afb4f78c8b454dbf4530a6c81c834fd9952557529f87cdcb0f SHA512 9cb023399eb660ca318c9d3461b9f177206792c3542564d990c08ba4788dc41da2f2c6070f0b55550b2ded0278c3f3d21a159212a20d18c12997658df3df5052 -DIST crates-io-0.15.0.crate 7833 BLAKE2B b51ed4a15d22a45d94ade26ab3d522ca13449ea1df93ef5ece2d4d7b99b85e95307f4cefaef91e1edb74cf4204ce3e0f3509ecb6597eb57f31f29edf964b6490 SHA512 86cc22ba197085978bd0928402e311bbf4f72356baed452c0f6ccbc7b95912944f4ed86a668d99f3ef7b0a20b20059b31c3b6c587c7c5ff6bedfe39cff5b8c96 -DIST crates-io-0.16.0.crate 7823 BLAKE2B db647566008661348dec4259ffd4eb52ce8acf50d9a23cef74efb7d3596a88c819fa9ef5230e885802e8d6c1bd456703bc9853575ab9eb64269ef1d87468db62 SHA512 2c1a4cc5aee30c922997c456af6794ec1421da7f4511e350fd93146ab8207423cc240102744af5776db26c2f792e1a66f9ee1001e1c6cc4a27c161437301f6c3 -DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9 -DIST crypto-hash-0.3.1.crate 7858 BLAKE2B adcd2b397a0226df7b326625a6ed179eafa2f550395782018b5daece122f0d02c68529dfe802aeb933e7ccbd4c969ad9fc0876673002b57ee23b881abcff6e72 SHA512 4c4002a08e68a03409096da5b3f3c8c4db9a23bb331c54c7f4a615ad0be64e3fdca3291f4a20b682dc4bc6d13b95950f02a306423c4cecb48664df05c46209c3 -DIST curl-0.4.11.crate 70262 BLAKE2B feae6f6cf51fe4ba32b93090bac7c341daee4b973b789e8c130e5e9986864d8ee69950b464aa2b73bc3643b063c47143241434dc85895de32546405855a43cdc SHA512 5ddcc26690e2cf1b655ca8699b8e67da8ee8a57249ba6c8a736c59bf40dce3511ca7442d58b087b42f7422b0bcdf1d4ac6c3522aabe15e575b6a22d8ca21970a -DIST curl-0.4.12.crate 70906 BLAKE2B 9b431f249f697608b3c295f385f90c452bb576f1cc0f34e17ad938f54c39f03575406061cbb9d55429c0c8a276d8fb81fb87b7c04453564bd2251604ea7e3cea SHA512 0f40d32b113787e89d5e9b12d84db77e629e67db6b0dea01eeb4a460299be4649221e286ae116656b314171a6021cfea68ccaaae5b27c242dffe8fa3e4f45434 -DIST curl-sys-0.4.1.crate 2982935 BLAKE2B 339b91b1634fd502b48d4f26923e1c9d8a3c9071f640442863cc811d02e03b018beca901b2a466467ec6d9ec1206b34db3e406763b8b3934aae1fa95c89f0d44 SHA512 74de40a631db102e73e133c9bad6bc093d7da744090e818e1173f237a410fe173e87fec937a902a6182e224c7e336523b73c42e136ef3b724949d3f407e78f03 -DIST curl-sys-0.4.2.crate 2983033 BLAKE2B 96967d56a7b6a412fe8cf927383eeae16786169b6f5b9254ff116fc85ed3ff2d38bd5766fded8d7972780e6c88c1b229658cc414b2bed9f301c13d6b91fac7b3 SHA512 3d7f9f089dbeda1bfba878cfd10ef3bb14096ee1701584c83c7d99ca859a60cef95ae46fc8b35e2845063fdf50ff8807501d2d45915bfcf827e3e2f6556d1632 -DIST curl-sys-0.4.5.crate 2983237 BLAKE2B 07f111f6274051bee5ce69c680b067f687e4fd741c6ea155535fc24bd447345529475eb4c329010f86fa30b3a08dafcbb34eade53ab341240674a9376b98fc4c SHA512 04b7213d82037d80676f553c2595ea0f3cc69f22f8a85a389075026a1d2325cb61c4f4c5ff6a2842e1a0bbf44d4617f18c47eca5c6686394c6e1e01b67a4d18c -DIST docopt-0.8.3.crate 42774 BLAKE2B 91792f94920a39aa1cb1014493bf2a31367e44db62c68386df3112d4f8f058f143d8238048fefb2f2d1a1e489664c1ac7341e9bea17a00fc95ea62cd7c8f5dff SHA512 0af5a548640f06c408ae1ef0eef804aee5154d677648de9bbc3dff0f637c26cf8b2e212f472a6d30353a92e2ad2cf8d8efbda163f9572b28f867f2448a0bed8b -DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c -DIST env_logger-0.5.10.crate 24849 BLAKE2B 2c386f8367aa940d41ea710652ba266cda7c12aac43e17ab859646d81264fada28d4b98bcdda46377adc86d6850b6f58559f9fe38fe9847b745e2544de9c9b41 SHA512 0943ec9707f187db4a6669b157c2bc5b606c865a9893eae18086cb9a6319b79b71fe3d97b4248339d30bd6daab2de5991f373a75a95c8fcea3afc293f333360b -DIST env_logger-0.5.6.crate 23933 BLAKE2B af51e6dd5eb9a26773ad225346c341e8292f1a1b79bf140660f1c2c10f62750300cd5c3c96bcbcbd832a11b8a14ea1f5e16575e65db602f0eb72896f050714b0 SHA512 3f7507cc5a2251570dc061a0603bc69a91bfd13b5d61cf85547076415140215d3d322408187eb216f1588ceb5fea3579b9645bc6faa3bdfb27a230c9bd1c59cc -DIST env_logger-0.5.9.crate 24834 BLAKE2B 430c10faf85b96a38fa9f465cd72193ae750e620815e52061b9a5c43261be2dada182e99cc8a4b10b3bfb8b1126fc91e0297b5faa294c80f3044186dff81b2eb SHA512 f73c6258a69289ae795241669aa16af8612e9a0c734adcf804389082a8d1c32520c9234551bcee249d47bfe43772d5c7d8c8b311a722b1d77001aa9ddb93a4dc -DIST failure-0.1.1.crate 26782 BLAKE2B 6e00d30bc0189325e540a0a9290e517747ebbc79a94a884540de1f46fc0a64d257b59604725cdc30e62731b51e45b6aec215d2d488bffea6511b6ff53be50a0b SHA512 3c4075dc13c3ea6557582455ab3bb35ea81bd43892de5fac103e7dbcdf24ca3614e3b3673f694256d9fb9c6bdf97375ea17fbe290148881599403c01dab0e5e4 -DIST failure_derive-0.1.1.crate 9312 BLAKE2B 14dcb7bab17f874e5f3efa9abd059e079a4580d918017825de104851fab0b0cfb88aba4f71513f387ca645ab74a3199c5f0268853c156111c67351e1c7e9327d SHA512 885b45ebe5098f04699bc0c7cf2b6816d3afec6f111f8d244b0fa824c0198127ac3062e23c052186e196832755e9e0b271e5efb005df35e6d1e4d671640b8e91 -DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962 -DIST filetime-0.2.0.crate 11717 BLAKE2B 2e42a0499832fab0759a2edc54762bbbd5b11027df9f8b86bd62db3363bc4ef520831a5a1ac8435767eb136624bdc21af16ee73ad1078d2036174e1c30598d26 SHA512 a78d227f17b04800d8796511709db518daf76047bc7dc7dbd3a56419ab1b1a34cc063a6656033b893edc42729d2a08cf85b344e133b6da3fa6ad38eeffd536ba -DIST filetime-0.2.1.crate 11797 BLAKE2B fa8f886afa7f7fea0f543e425bc06ab0bdbfbaccafb7a5bf5234fa1a3433d90398dc42bb24832132d042032e20042495fdc2763f81b8b7244c6b8d8a5e660367 SHA512 749770e2b484c7d1e94beec490ceef2552b7294e3cb5ea67033488800babf7d48898b5d6a0874b113dfe95004322476553249d57349dfc3cb575c26d4ebf5a9d -DIST flate2-1.0.1.crate 61869 BLAKE2B 3f9b94327ae0d044f962759fe498776d7bef014fb93328e3454f5cd8f37c8ac8c8c5d3f38825e4744a07dc873f93ba5fb420450677a55622afca8492c9423057 SHA512 2be6cf3228e9df76643e7b45ab1ea4956e7618e90e9bf8cce62f6d0bac864e2bd7a808aad1b54728797831b170801acf43a6a254d9268c8fc57052f1e2d172b9 -DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 -DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 -DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a -DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50 -DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 -DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 -DIST git2-0.6.11.crate 138769 BLAKE2B 47ff0b7e572cdc87a4e8ea9f7daf2b2e9fcd34e2b8cf0353d355b75d73f8843a9c7762492311aaeb640f1aeedbf25d58b7a57e64ca6f4e9fd92e1ff8b499413d SHA512 3319cb6230c4d2913a2194dd35f1c2a8665c892682ede92e9b5c73b4d53a1dfb572d2e05ffc97ebd1bebba52311a708f4c5697d3238a71d35633a869f495fac2 -DIST git2-0.7.1.crate 141487 BLAKE2B 290fc93f04efa9eb826475fc1236bbb6451bf5ea50d7af3e20c4900d500d4a0c339938093502051b82e8656b42d3de4096c1aa98fd12fa910ff11b5a1944fdc4 SHA512 efe7a12d877b995b8cef59c0a419f86c17453ee10a356d7b1e58cad8d3ca14e1883108b0137a3cd9b4d651d4e4233388686d91c9cdca8b1d942cfddf477f74e2 -DIST git2-curl-0.7.0.crate 4097 BLAKE2B 95d80cbb573f8e71bb47317c029b39e309cdd3d113db85334c4ce3f3a48f3bfee17ff1bc67828fa8c2884b2b51620a607f6a18a50901828c77da99c1d6463551 SHA512 b6adfbe6f75afa1fcbbc0a38f9dd13db87bde6e81eb6403a3f47c4d25a26301677614af82f1c7cb4a4a2122910e0f6450d7555f2bbe9ac97dc1da1243eeeaf0e -DIST git2-curl-0.8.1.crate 8903 BLAKE2B 83f58faa5555a0a3a653db1e0a002008a7e2d6c216d2ac7014b06ddfedaab8f114cfb10d2577d799f77610032b64d786b64a82d31ca38c981192899ddc054496 SHA512 014a3f124ca633a572d4bdfe38742fe4b0fdcdf52ad170b82078c8cfeff1bace87540d3ae41d0457fca922bdcb1a25499fdd30e704eaee69da14e4282a9be1a7 -DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e -DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf -DIST globset-0.4.0.crate 22113 BLAKE2B 609c707ced976adcefd109bb43ff6bb7da21f385a46585d86b22cf76bb1f5addd744a19daef3ed2f9f4a31cd74b7f990af5f6a942ae77398da18e3f445ad916c SHA512 f24b8d9aa298859bba38f8a5bbacb8f2cb6a8f6fe165a14409216d27d856885e234220a15d66c133725cba39a802139c6242f2e5f3787154f929b92152f4d1a8 -DIST hamcrest-0.1.1.crate 9217 BLAKE2B aead0773fba00b44ca6634dfafdfdc9c1856cf0fd8c6f32de7dae4be1285021ff097a140b8aed28d1f5d5a279681f95d24de96f45f14aba205fcddd0bf301f0d SHA512 6d6557cec99f482d6a738835d32504252e0a666c1318f6f0ac0f811afa7c087c048960ecd2fad22b403fae9a00b06f742de643a7b5ded1f816c118272232ec2d -DIST hex-0.3.1.crate 8365 BLAKE2B bce1c771913e57ef72a24fed523a36c1fb741025c24a2ba3a4e236e19b9c575b7553eadaddae2e7f50a6e9078b0d363b0b71311301ed6ae19d064dcf052e4056 SHA512 beeb497718212f5f4683cdcab257c555554f6682eb1a1675738aac849968768d4f3f03bbb00b74bcb391b0559772e6d56ec38496dea5f7aaa45dfaae5e6355d7 -DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852 -DIST home-0.3.2.crate 4069 BLAKE2B c6fd346774ea9de716389d33b0884eca9d06bdafab14cc242ab539db287dffa932635dbadb2db277a1e18c0592e4e0b4f42b63dc712f9dd4cfa92ef6ffed6a7a SHA512 e7c1b8bdd1faa65a81594378bf86310aec15b3f57017e11730e84dfe469bf416faed27b253a3a277ca549df42881edddcf7c68b6267e87b41c1f5a2b07a36f13 -DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b -DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6 -DIST idna-0.1.4.crate 289112 BLAKE2B dfd3449388dcf894188bbc4bf36f82afd640a13d6aa091a876e6048ccd47f4f4e4c44510a27187ae978c9bb8d71fbd76058c2e501618dcd3b94f8762e2333721 SHA512 45e04b1e4619be105866ed098e486700951e1765ebc4aa84122266fc3995ceb2a99f30465ca9202cc5f35db049c7a64711b77f347e9c983b11c0840f7654a9a0 -DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a -DIST ignore-0.4.2.crate 42184 BLAKE2B b16d3f333a4d689bca22f448d744fe3ddb871a896e59b7b3dd7b07a5325530244166933d5dc5df3fc54b54099b0d44d3137d47109dbf6955b2b121f7c68ec88a SHA512 8b10cd03b6a46066695742d14386b19743ebf0e1172c3e9370b88b3a450de0ab02e00f8ecb95330551753a968bd2592b49d7af53d7a86e64e7e6fc2823cf69bc -DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee -DIST jobserver-0.1.11.crate 19687 BLAKE2B 1ab784f253bc3a0108c30f1ebb02106e6c7d86f1654973d65c84adccc52cf4cc1f48447e8d40bcc8b9ab5cbbc9dc0becf35f9e7c81c8c6340b1dc41121b4dd9a SHA512 daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3 -DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b -DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b -DIST lazycell-0.6.0.crate 10099 BLAKE2B a0746580ca979298416c595c6e5683ec1c1f17c3652a18a393589441b8632a7c8a369af4991b11fd857b5c4cb533219e1e21635159e651ab0dd480936e38b811 SHA512 3e3267c6b64a32142b1ed7533073dff1a9dd4304528a13838efe9fd6165beda40a2ab0613fca44ae639e67d94b4aff1c004039c52f2990a741c84358db1dcd84 -DIST libc-0.2.40.crate 327272 BLAKE2B fbad5d1e07d6ad43cf0c94d1e5e1ae9dc11490d7a500a796060fadef39b4b58778aaf9eea27c6bf93b9481b3d94cb807e192860eb074c682ac559349de9bf9df SHA512 21dfb230796885d4459b1119de31f2615ee4f1020578e74d2e07fa5340777fde4c2f60aabba7444f00434519c95f12e6e1a3bfc496b83c11cea582a219005dd4 -DIST libgit2-sys-0.6.19.crate 4663410 BLAKE2B f42d0f08c248ed5783f8a5cc2a08051c6ba881a28bf6af433ea632e88377ccb7acbc01f69cfeb0e3844172c95bd1660d7d92287d4353f0446040733a2e0f6d97 SHA512 3c5823ecadfb8633d3880552e6881265a21a3bc395120bc51c93424ef8fff6be6d4c1b20930d7f94ea5f826e005778878f61512ae4fed2b2b8e35d8fe1852495 -DIST libgit2-sys-0.7.1.crate 4717492 BLAKE2B 9e35b9e317b0423718bc28a87f66095e7c3f0758481868b55bc44044b698b2c91d9adad40c45c1f92ee8a41a4a964f25664715c9966e20a0edac81002a1187b6 SHA512 fb5ce69031dc07ea20a8ce03fcff05d44261f41f40f3c7db603b5afd494772c69e9b7d220714916774ae50b5b6f85015e048f02699a23d090ce4fc934a033460 -DIST libssh2-sys-0.2.6.crate 412381 BLAKE2B 17b16a73f2c3042891d26bdaac836e35f9839c8e500643d7b2bf8ade562b0af5f2f90dd7728b1b04861b40deaac69184dd8edc9791ff0c9fa97ee0a3b9065091 SHA512 2a02abf0b29025137d73d4b97a6287142f5677383f22085d3d49f76fd0c8324ef1baf5e9d763b6cc2dd1e339f697b9466341ded5ae2c8cfddf6eeb74e870f8ab -DIST libssh2-sys-0.2.7.crate 417647 BLAKE2B a19d1af25964594c3c460febd469725740fc0954eee4d51dd204697f97d8149253e7eb1f90d4c08f3617642e3dfd33e80197cd1efed4ce7ae9525a7940713342 SHA512 817d6897aeaa92fea77ed5b23df68f5f10760f2f342947b178aa460fe3a75aee6913ec1ad7e34d52a1523637b7f3672a8e28f59c05ed03db1caee256ba76a45d -DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c -DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f -DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0 -DIST matches-0.1.6.crate 1916 BLAKE2B 0ed7a81450fc9f639755f4dde72c226e107d8f5d9eec7e191efaaa4423d0739e3778ea358294b17eb35f3ac2918bc04b4009aea52d7c5f4335144180b444e881 SHA512 0a613c6daba26056da06cbc4a8a66751412b8e5709bf0e24e45caef76e308b918a2f6038342f3428633e388fe7631fc3978673560829b0842c9ceadb4037fa90 -DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab -DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1 -DIST miniz-sys-0.1.10.crate 53357 BLAKE2B 88c511d46cfd47fc2053bf618180d6da3e7912bc9d0e84e4f904506daeaa5664c5f7c5036f3536c8c6def2a5b2d0615bb3bcd309653544c236ac3be64987cfaa SHA512 d7a6f0bc462cf10a5f630ea20f4c991830059b359f67780e160a662671a8bab21bbc29aae2220694d008817b1227b9b8e0c3c458b99a29ad2e5d141241c60844 -DIST miow-0.3.1.crate 21858 BLAKE2B 2771d7d56f98a4ce264e23367a6d061d3f2b66de2e22978a676d697634a7f26016a616c68eae05e85e099d1b2d22e5036a41cf9a35ee08fa82de0b8d7295f44b SHA512 6ee94f330283b71e7ffbf57a3e522ac346a06a4a3a778c0a18f77bae3ece675db5947460e58d88a227bf9b392ed899bdecf1d56de57aa5e27bfb556941eba0a9 -DIST num-0.1.42.crate 8323 BLAKE2B 24c31affacb1a4bdfc30e30afc402d92344d4d17079b9cfc103e5a7fda50b0c62a877180b94af79a8898bb2b81de44324b04c00d5983c8d10d30581f3027464f SHA512 d8d48080f84dbda59d16418f39aca158deda1fabfba2aed1944f77b3c6099a244d7a32e79f28b9b72dad4cd446a8f4f854afaf3f368e3ffbbd124e64e4aef3cc -DIST num-bigint-0.1.43.crate 63022 BLAKE2B 428c1bb5c0e0ce0c3b5a0658a555ef79496f52384c1df393563c17baca1888d4ffc1088ecfe06028190b3265829887d95cef1839484748361fd0ef3f5625ea7b SHA512 07119e28588b22236fce2f5cbd074ccc1b5a31081a9f5ca3d5981680ebe68231b21c1250d80f656ab1411f0ab3aa942d54889845c03935f28e68fd510ae943cb -DIST num-complex-0.1.43.crate 17731 BLAKE2B 4b18c7839e7826c16c60b15f9d5c6bbf9f9874e962429cfaad6fc9fc9bca9dfb260ae390e051dac2b2e6cbd4700666851318ccff137badab00bd39f8c4407732 SHA512 e82f3ea86e9725a51e6669aad07b87dfe86cbf2fcbf76629a2479bcb9b7c5ea2cdc2fab7a98091686c15f4ae7ab68c66e01982f35738f9055a41938930e72582 -DIST num-integer-0.1.36.crate 12168 BLAKE2B b492ae16a4143996d447dd2cdd348ebee6237d924e2f756ffb4a236b9de166a9b12355ba8e9027bebb58c50404ec64f392b0c52bf336c6205128e27d1184cca2 SHA512 9f7f8ae499ab181d77d69f6e761457fc170305767a0867142ccd549cf55c24b9731434f6289856d959ac239aee32a6574c77a5a783a701ca583310ed9134911d -DIST num-iter-0.1.35.crate 9013 BLAKE2B adfc4bfb7f390e2abbed94fb64348f4f4e7d6652f0bd5aab4d7f06a59c1cdeb46a5190ce3868e64705bec208a3ae4292516d99db2aef120153de5eb01a6e4251 SHA512 df4fc06ff7ae28b4576a1004d2284d49865e899ae315c5621258aa1087c951b2927e1e413d2a8fa992ede242c2e73eb40c6efbf3feb1adbbe5aad8ea323d9e4c -DIST num-rational-0.1.42.crate 17253 BLAKE2B a3aad3fac51192e00f00a4489590c1358adf1bc7d0704dd069375501fb820c1413089f542900ad5593745d4c5f775f7101a38d65c1e2fe892dedf3d6f83245da SHA512 f0ad3c6e807db1cccb5260caa1b2abce354d1aca63e765c0bb2d18401e941d57a47c8edbe485ff0d67ab363c937592e2adcb89538132b5a2d6d4408141f17ef7 -DIST num-traits-0.2.2.crate 34777 BLAKE2B affa210c22e3c27f743d6b23393fc61749e37c066fb4503f7d9d5e634a2236c2632bb9fcb4130be10aea64a583e15160d33e28570fbbaf8ef935b1864fc0a9e8 SHA512 2b2baea40084f4b1c7b4aace26681e92f0d4fc40686ce248849ca9672b2e24f545dd168e37f33ef162b07663e192d81c9b1f2ede1cd45afa5910fe9aa2c365a5 -DIST num-traits-0.2.4.crate 38463 BLAKE2B 9a44eebea444c2184855cb41b39b88716773be2d2f146ee603c999c377f3249b4580133608ec4ba968e27a976307b030414c23eb9dd1ead655c3aeb70431abc8 SHA512 4d1f378ea4ca6edf934ad92526b7556944dddfa00d77f2f6795c65bfb5aba4a20a747e01cbd1fb8250e565eb541a48dec8aab00d6505931b5cbc25be0dbf929c -DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8 -DIST openssl-0.10.6.crate 158082 BLAKE2B 2a9e6b77e8a6c55c2fce9b0961c2179cd6ce2534e714eff9c3c07d9d70177ec30e5f47092e18040c8dd9396563ea3f05e5a022af035ee359a1f16ec4e2b8c86c SHA512 9e4051c1c4d4b5143c9148f46083fba8df5c9e88e8a2d60398af21012d79b7a65feb5d6a6d1a704445b0ab74e9d23ebcf95d97df33a76ca488c3f188c9126e9f -DIST openssl-0.10.7.crate 158397 BLAKE2B 4ab202e9f3bf989c3d22e57a016de5e11aec92e68a9ec9dee6e6ff13b29f6c50a720d3800e27c0c9a0c5232ff8b3bed2a53d2e4f0b5f70e5928c7c5d80ea0fb7 SHA512 17299119ff9dad330a0a060283a485d28e2ab85beb27ddbc2f156526780831a5d135e00721bd2d609994da3c0bde94c51892d05f5037b7066ad0b83fd3b9da28 -DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a -DIST openssl-sys-0.9.28.crate 40560 BLAKE2B c5a1f34ed11f37b8d842b4971810f83eb6e24d74ffae931224a5c9ac992030bd9f034ae057f0ce9efac3d4f2f20898f8c4ec33d5290f8747fed575c0d003c036 SHA512 a156e682dc7c7d8075842623b58a3f3386c330162cd9489ce96a33f72e0368a381e4d0e83c43885d221a29edf1926a11b106dbda273c863845ae28a51e2648b3 -DIST openssl-sys-0.9.30.crate 40910 BLAKE2B ac7d2d33e002e225665cbda05bce46affbf733361dfe2345ee2a0c846bae1da54d16d64de12aa0ee9358950be239a5900c0b487d16544d0c699afb16a6820bab SHA512 0df144ec31e665e406bc731cbb938763fbb023dc9076a1cf9c423fcbb8b230b639138bf16b563d2a3e9e6c2c2c89f04dd92d90afc043982ea0ee94785d2cedde -DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 -DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6 -DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1 -DIST proc-macro2-0.3.6.crate 22845 BLAKE2B 1491c55e9e417900a12e9b2ddef34032f2141eda9f3863bcd0fa0deaddc106157e366976fcc185f2fbf6bd8e5036c378775e39d1ef1b21a1561425f56b374910 SHA512 4999d6f4916005e6691f3d865cd6d58fb26e672319e9d941d9fbc6403e10ca2b6ea761e5e2d84cb60324f235ec6a57dc2acb064997fcfbf63b90b48b1d0df9ff -DIST proc-macro2-0.3.7.crate 23402 BLAKE2B a6c5eec8384611c7f6a0dd9840ebc6b292eb6f7711c6dfdae1ab376bc4a8231dd7006744a27ef5703f04900e0b5aa58998b1c02cf341607be130612f1d99d957 SHA512 dcc923271886a33df34e2385a72b3654b66081f97082ed8ac5d9e65cdcc9352a31812c18c958e2a0d00797b98e02b34e0d40b98ebbddd6773f51628b26ca6640 -DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d -DIST quick-error-1.2.1.crate 15112 BLAKE2B 615254207c47928c1053a4ecd1b1a64a32e9e550c8d74ad5564b31404469460e063aaeeea3e3a8d48ec2416edecfbeefb8f84fbb8f2d9eaebd6121de2d5ad9b4 SHA512 86242dc5a5b68d4d4df50db54b629256d8d33f9637c457c669d874685dd5218f96d0a2dbb16b5c77cca67480e2bc485b3aca6fdd100f615b4bd00004910d2ce3 -DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7 -DIST quote-0.5.1.crate 14960 BLAKE2B 123e12032797c8335ddc182c2e95016afc866cfc041f26d45e3482c6f689719bbbf6340ed07523acada93953a9ec672914b648d71e45008dacc033f72a7de5a2 SHA512 bbf670fbfdeec126de0a083415f11b2cefbefa30db8390c2b7b80a2e541030cfb8153f2cbd2641dad6d35e25eab9cc3143861ffefe536bd2d119f8d967bbb44b -DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac -DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad -DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48 -DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 -DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0 -DIST regex-0.2.10.crate 208632 BLAKE2B 8380f1e91c99c73e12d125bcb7f97c8851d55e509b3c2ee3a87c7cf6c8d432f800535cb200f4c65276a9752ee2a966b30e70af41b20ae70038579ad66d584ff7 SHA512 2f2a2c0f7ffe4c9711a689b156b732b5ba58774a0f2064a64527e1af29ad9fb8ade6580f10b52f912a9bea373422bdaa995b83d0f2620aab9280e43330953614 -DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead -DIST regex-1.0.0.crate 210131 BLAKE2B 487f8a384f341718be0f4ff6e85e9f100e4cf089dd8b1d3d9bcae0760955cc496660aca153fc43a6fd47045b26031954f9ed97f8fe443fb7f741fd3ec274beba SHA512 857e7406415c4f212c79384a0b2b6365615b9f49a4493146028b04fee3b6438a68fb57b08e77e041f776476fa71c50399508ce0c8c0c53069d125a5c8ec055ad -DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506 -DIST regex-syntax-0.5.3.crate 233364 BLAKE2B 1862f7545e92a06b156a65a998f6c42009400787875e7728a458868275eeb4564807de5512560c9cc646ea0a0d661c67ea6705252d8adbf5e9ac09558b2076cd SHA512 03034432b2a27c5b7e79ca072405ce4639e097843fe9861f0b8a0f289b37ff28e03c2454be0e815181882da7590ac1e8a356beefccc2bac57d02dfdd1f404d65 -DIST regex-syntax-0.5.6.crate 233912 BLAKE2B 828c35471d8a91be9fbcad00e036c40ff0e2c38d008c5d916cb096f0a6856f124a64a203d547fb5ef45cc296565221e5f96343754413cf6bf2fd1463c7e02f1d SHA512 4ee43272d0d6e5cc0b554816e20e2d93b0ee774fd71643d5edae06627b295d374769ecdc3c1233a688d306d1cb86a83b6850ffe4022baa3db78beeea1190b455 -DIST regex-syntax-0.6.0.crate 233363 BLAKE2B a48ae00749fb9c9f066da54bddd14e8568b12d73a3a2c9006f875d676c926bf2638c29b1ee1221260e031f7d38cec1def47989cad02f37d3c8753e8b65a20253 SHA512 1db2f8f4e397b434502629bc6a726c23f4ddd493c653a694153bfc3d84f8ca759ad20e0191b990dbcbb3e584858070d32d8ad050536c818a99e912911531b162 -DIST remove_dir_all-0.5.0.crate 8651 BLAKE2B 4ce249473bc67b5ab0c3e04665a67b3c73224565071cb2055ddd461a775fef18ce0e973f281e53f5416bdad506e9b53da184078986950be3a07c534360b4544b SHA512 876681ae98ac9a9cf0447397446ca7afb4e254cf0cfdd7a9b8702eb94cfda5230ac4daeaa067a3f07ae303b920d1a97fa4a0da76b80b4545eab1080bee8c1574 -DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928 -DIST rustc-demangle-0.1.7.crate 10681 BLAKE2B 2679a27863f3172712d13d24cc76e13c67b61ae018cdb1ce01296625a2aa4b53c3c44572e9d2bc639ce9f663e221fed8e91f79296bf721a3934b8d4267587b86 SHA512 75dd8581fd0dccfcc8cd2afaf18b9f44a5cea95f6c6573bf9e0b23d79cf5e959b3565bea0e9e26ee5b80f3142a16b549eefa99f5f65aa0ca9c780307091358ec -DIST rustc-demangle-0.1.8.crate 10737 BLAKE2B 94496f2ef9bf40f3f25ad507119d24e1207946642e3cce081d36946713bf32d1813491c79ad15a6c7cd871c32ecfbf02fb416316fb0309d8726b23b3888343a5 SHA512 ca3ffc2872a608f13fa795d97d2a5e43da978ecf4c16973bed372a0b58334a70616087308ce00ca729932c5dbd9fad3a7b7dfcc76d16008fbe9cd882b1b3df31 -DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884 -DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951 -DIST schannel-0.1.11.crate 38229 BLAKE2B 37ebced9870387d38d57f83abceb9ee37103fe7141469022c895c7b0beaceb1ae2102d5d29616d75131275b91d0d4ce9c6d8d8a9bf69d44de2f5a9d4ee664e17 SHA512 b46cc854eced92c1e55d97b45459305295c266a9a9a7f71d94bfc5b95fc1f7fe85f02188baca7880fde5ec675fd3e9fd5bd81a8fd1124b24a563be2077212c55 -DIST schannel-0.1.12.crate 38498 BLAKE2B ec67cfea467925e2bb31ae6afb3502689bc0bb89d6afc19efb1ecef52fe02aaf3f6523194a249a7f61b475104b29eb86177290af341af103f3a1e34268f193c8 SHA512 9599a2793ff16b14252300b8040d337d230e0e5cd003167c6e453d98de61736a694a5a48d39ee79a2c7b96da914abbb10e8de8ed40505522a62781ad59ea81ae -DIST scoped-tls-0.1.1.crate 9080 BLAKE2B f0008e0f08159cf2b8a7cc3c0fa23ce998ba2930cdcffe0b41d7fc0baa7e5f51949049961536b79c29371adbf4af756a24312e7c716b57918ade598796bc3895 SHA512 6feea7f837713c90189d50b06d025db266a81dacfbc0bcd97e4dfed1900cc9d03e74e6d66864236a0652f04c80d57f6f8cb760ee6942c51a3e351e7cb88ad9d8 -DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719 -DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc -DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f -DIST serde-1.0.37.crate 66879 BLAKE2B 6ba8dd40f90ddd8b282654628b98e775a8f51cd22fc51ddfdb93c01e3ffd62cf92055671009dff42eb3207775e406f3844c72b1defd57cd6b473049900aa1c68 SHA512 53a3d08285e1d40707972b7ba1d60109207a49c73322a866485c6d057ef9a23babd1cbe3a9bd693dfe2b477e599b75982103dbd0cca11f8d6fba31b63d5be989 -DIST serde-1.0.55.crate 68121 BLAKE2B 5b83ff645a24af82a1befcb511154da57f9974594df8fb1d9728e58556b46a21444566c4a7e771f2f05b86300f5ebee94ccc69db990668e46a919fbf8ac84ba9 SHA512 d1d0b80696a3dca08878768953fd43cc315527bcd1bb19358fe861ea1419b8cb057b319b0aec33811e5f6067b25f26d2727fc19a11a70fe11f977c98d373f1a5 -DIST serde_derive-1.0.37.crate 29589 BLAKE2B 9575eed9c305247c4291413d3e504dcc2562ab228abc181358b8a8fce2b565ac6131dd6767499c73b83b9c0e04c07aecbcff5d1c13db21faf84c583476ff0806 SHA512 bb9ed046b4e626a5f0d4e76ecbb74be28f8ffa9d18d2533db493adcca33291416d4eb00161231817e67b93aca91548dd5dff25f4730dd59de8eeac17d394f23a -DIST serde_derive-1.0.55.crate 45154 BLAKE2B b6d31b8192192e4ee152c1da3b9d559d1fa870d21b190184b206531afd81c12753476a36f79ad8cdfcdf6cdda4f8c752e7362ebfaf9075b63f06d3a74884a37b SHA512 e4815c04376c24f98a57d9feb625901d2d5a7ccab35deb5ab9b7a38dfb683c01ce96b0abba6c808b98a1b2ebba4af622c6156e6874d9c5ab522fe7cdcd00aad3 -DIST serde_derive_internals-0.23.0.crate 19939 BLAKE2B 6b13dd310cb6af94ee3021fb85f8aa19d40b183f8cb06e23ea14143439e628ce2a321e80b7b31c3957bd02b21a9f901ea4a06578b340eb7683e9bfe06d7a2dbb SHA512 c976ac6110ac6bc98a0b36c27afb7dda3c3a13afbce291eb912e8d0e48ea9faaa4076a60563b937c9c7b48c7ddc459e7b1b4018135b198e9c345f9e245453434 -DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4 -DIST serde_json-1.0.13.crate 63744 BLAKE2B bd694199e1eddacd6db16ba0b5255c651e4154d5be4771a23e990d51a2894731b4d4831a26dd3c838629b40d7100092f715d4d3d0b41abca5118a3e69f115b69 SHA512 cf9f034d8117b1900cd0f3daecef920b3d4ddf061c9cc8cf42005593621c0460da70ae12608d8704e180578488b5f2e7d57791ac3ec06a2842e47a2e5b7a9eed -DIST serde_json-1.0.17.crate 64689 BLAKE2B 292c0826674e837fc909b7ca3011c0593948d646982a96e355fe2f806fb058a7180bde72ee7c9d2aa6ceb3fc5b4ec52a04ba450e3a6ad64e1e7e04fc4be2e31d SHA512 69f036479c3133490c918b79db3304c728e2d5b54022c67062b01278e7567d3d5109d4e19686a5a902c64d4ec527328a1eed21a7c7637421d8cb08d4a3fd83bd -DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329 -DIST socket2-0.3.4.crate 27946 BLAKE2B 13f9ea9aa296dbdd70303f8525b2f8ad90e647456aaf0529bd54e061f4cb248eb9c85d0b9cf6a4c8e3e3787de0273ea337f88ca9f32018d01afb34130295a075 SHA512 460e80bea03bd34b8673146b577d7ddc90a0e00bd4313389a560ab4f7d109bdda68cbebb63232f20b4bd1f772da0070351fb78a1d7cca250273a25005e50016a -DIST socket2-0.3.5.crate 28077 BLAKE2B 1259aeec8e0b1b02abd45916b19f94d8eb9127e59b56c279f33bad703e3cbf7336e119c2d5eb9ae8f54e8ac74f16495d26d51fb579ebff9a53947b101cd3c4b9 SHA512 66c8e975862dc4e1498abc47199485c802a8ef09ddb1f9fb0af7613d794f98aaaabe96490d7923d3a3f0cae91864ffc1edf89b77c56231f363c2a1cc820edc63 -DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97 -DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983 -DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e -DIST syn-0.13.1.crate 133086 BLAKE2B 6c23e6c0474c316c8ca420a5463401ab8fa5e8f4e774a5f3041cb2cabfa4ce3894bc36bc077d3dceeec438e3f19725fce71f1c860b74583bb3fd8dcfa05078d3 SHA512 0c08ad8438e2dd2a067ad857128c19719339dd697e5860c6280247229211c5abf56a82ac10a87b1d6fdd3f3c6026a4477cdad1cc63d22db6f407b058ffb5b25d -DIST syn-0.13.10.crate 134334 BLAKE2B 34ee50a42310d088052145c588e7c7401bddc08a48c3d1eea2f07a19c6b242425f5d235a2f477c8a75d18eb572b00d0c6114eb085b1e17a65817e12af83fedf6 SHA512 7ee41788cf98f7b74880a4935f526e7d152d17159d9a4be185a46e4e6eab3a22dbe31ca57e5cb0001041aa8ff0b15a21ae6ef4fe9bc9117b612d0e60add29d5b -DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e -DIST synstructure-0.6.1.crate 11257 BLAKE2B 28a71b4f0e49a658064dd5b4eee0f1a61ef5502a24de4edb7aaa0f0741529a7640b874d19400757feef527ff78432e29fbe8574732e19a7395d13f2cef23d39d SHA512 e3234d03a99373a7c35a33611e7d5383b282f232a17c592d630dc2ef5613ca272d3f8419a87d40cf1d50f3ff982a01086d9b7a0202c5a819463d157f684d41b9 -DIST tar-0.4.14.crate 41988 BLAKE2B dbbc3f1517c817827f7cebe84918cd3aba9a3aee65a503b9da7647b187f1b4f0a173649c97bbc7ff3dc0e93486881f00a49b9a24c70c9df249d26a9f13cec3a3 SHA512 b46685caadf335ec296a6d7ff5c2bae31a50395a3681a733998dbdf6295a4a55e7b094340b4679f9468f430f5c92734e08b75123de935dc5636b36d06c498b96 -DIST tar-0.4.15.crate 43037 BLAKE2B 999e3ccf528e5e72bdbb7c1fbf1c3704e55c15906f757cdb83bc04a437623058c4a204a4a7c4b423ca383babf8b2e07d06586b811834d11a5fee57a0129c2a1b SHA512 b5e95534836e99ef749dc4d517e60f799ca6a88a246b30b7bf9731afa3fe5f207ad14ecd11435da43f7d634ca16bd3766dfb94fe7ee0cbb1611773aecc46b060 -DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe -DIST tempfile-3.0.2.crate 20825 BLAKE2B 0165940c98b5a28dcc087bdbaebd94dffe532fd571b7f28c440583848fa2368029c9416be914291f3ff0366066b2c99b8a241f3e581209f73fbfbf8c71188530 SHA512 8ece130a10d4a698884d3d29530c925944ef6d9bf8375b87abdad890cf1baa196b0c80b461b6ff436a8fb29931e181b4d0acba50e851ebbf4c0e9aa512e823c6 -DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90 -DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76 -DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35 -DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0 -DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35 -DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6 -DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95 -DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738 -DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e -DIST unicode-normalization-0.1.5.crate 290328 BLAKE2B 47611127735629ab5ca8eca6a32754b3d14f0da384310b9915fff3f988c28590ce83b757258c7d09a1640e65b2b4307a1d5af96f39ee4f6a70a7aadfee955905 SHA512 e3a8d69080d7c85c140406fb7514c70c6af3c3c847d2a4d029d6494035d2a77f093b9d96e26bf59ad973187ccc8dfef1a4fadcc2eb2977b16ecad9f64bfca941 -DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e -DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3 -DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091 -DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d -DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948 -DIST url-1.7.0.crate 67909 BLAKE2B 342d0a01774102625e7411c067e1949d0d5fdcd11e2381aaeaa416c9123f977e5b8c1b988e94007a4abf654fe58c9723f3b1bf8644515473e79976da4c0327c1 SHA512 080c4b3a7e576fd4cd269605a5bd51c3e04fe9157200f7f411fc10d6f5a86b49c0e5c1dbb0bd522fe4be652836785ab716a80fd73474476040a0a7055772d90f -DIST userenv-sys-0.2.0.crate 1749 BLAKE2B cbba1af566a05a27ba571b25be6e5bc47b98cc1710d89083023586704e8111158f3433214d7bc6a0d72af40f589679791dca9a99f73d17cd29cbe75281d4d476 SHA512 97065d57b63045876685797b6cfe600d65a7d3a3b66a356ca86df735f19de373eec24d4eb679c013ec8bbc22954e8c258863ddca608bedd830fcb55df01438d2 -DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374 -DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643 -DIST vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2eed4309ed2639ab55660f9b81496e1f42d6c2ad9d3ffeba6275ed4c7d1d6a29fd148abd1e8784abd29cd SHA512 e56ca76a699a6a857d77e9710c1b0b0ab7a64b6f7128a9221b9a3fafb7365b3a008c7eb2a2323de449ffd5287d4b5664b9e6d0e1204e9b5a722ee848bdcdcb18 -DIST vcpkg-0.2.3.crate 6015 BLAKE2B 8259f1e9c137fdbbc0277976bfaec28074af3ce87149fffb441a5692c84b0e4a9c70b61b57d82c82d7603569fb3a9a86244a68a1834797e4745f179b941d1ce6 SHA512 ff1440f2d7d2e231fd959a328fc07ac1d4e4041f42723d2edf2226b74024aa13016eaaa364d7221ca8440381769ca03c24bc1c8d49aa2b5708871541b8a9ef0a -DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 -DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 -DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387 -DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe -DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579 -DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 -DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374 diff --git a/dev-util/cargo/cargo-0.26.0.ebuild b/dev-util/cargo/cargo-0.26.0.ebuild deleted file mode 100644 index bb5b2813..00000000 --- a/dev-util/cargo/cargo-0.26.0.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CRATES=" -aho-corasick-0.5.3 -aho-corasick-0.6.4 -atty-0.2.8 -backtrace-0.3.5 -backtrace-sys-0.1.16 -bitflags-0.9.1 -bitflags-1.0.1 -bufstream-0.1.3 -cc-1.0.9 -cfg-if-0.1.2 -cmake-0.1.30 -commoncrypto-0.2.0 -commoncrypto-sys-0.2.0 -core-foundation-0.5.1 -core-foundation-sys-0.5.1 -crates-io-0.15.0 -crossbeam-0.3.2 -crypto-hash-0.3.1 -curl-0.4.11 -curl-sys-0.4.1 -docopt-0.8.3 -dtoa-0.4.2 -env_logger-0.5.6 -failure-0.1.1 -failure_derive-0.1.1 -filetime-0.1.15 -flate2-1.0.1 -fnv-1.0.6 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fs2-0.4.3 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -git2-0.6.11 -git2-curl-0.7.0 -glob-0.2.11 -globset-0.3.0 -hamcrest-0.1.1 -hex-0.3.1 -home-0.3.2 -humantime-1.1.1 -idna-0.1.4 -ignore-0.4.1 -itoa-0.4.1 -jobserver-0.1.11 -kernel32-sys-0.2.2 -lazy_static-1.0.0 -lazycell-0.6.0 -libc-0.2.40 -libgit2-sys-0.6.19 -libssh2-sys-0.2.6 -libz-sys-1.0.18 -log-0.3.9 -log-0.4.1 -matches-0.1.6 -memchr-0.1.11 -memchr-2.0.1 -miniz-sys-0.1.10 -miow-0.3.1 -num-0.1.42 -num-bigint-0.1.43 -num-complex-0.1.43 -num-integer-0.1.36 -num-iter-0.1.35 -num-rational-0.1.42 -num-traits-0.2.2 -num_cpus-1.8.0 -openssl-0.10.6 -openssl-probe-0.1.2 -openssl-sys-0.9.28 -percent-encoding-1.0.1 -pkg-config-0.3.9 -proc-macro2-0.3.6 -quick-error-1.2.1 -quote-0.3.15 -quote-0.5.1 -rand-0.4.2 -redox_syscall-0.1.37 -redox_termios-0.1.1 -regex-0.1.80 -regex-0.2.10 -regex-syntax-0.3.9 -regex-syntax-0.5.3 -remove_dir_all-0.5.0 -rustc-demangle-0.1.7 -rustc-serialize-0.3.24 -same-file-1.0.2 -schannel-0.1.11 -scoped-tls-0.1.1 -scopeguard-0.3.3 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.37 -serde_derive-1.0.37 -serde_derive_internals-0.23.0 -serde_ignored-0.0.4 -serde_json-1.0.13 -shell-escape-0.1.4 -socket2-0.3.4 -strsim-0.6.0 -syn-0.11.11 -syn-0.13.1 -synom-0.11.3 -synstructure-0.6.1 -tar-0.4.14 -tempdir-0.3.7 -termcolor-0.3.6 -termion-1.5.1 -thread-id-2.0.0 -thread_local-0.2.7 -thread_local-0.3.5 -toml-0.4.6 -ucd-util-0.1.1 -unicode-bidi-0.3.4 -unicode-normalization-0.1.5 -unicode-xid-0.0.4 -unicode-xid-0.1.0 -unreachable-1.0.0 -url-1.7.0 -userenv-sys-0.2.0 -utf8-ranges-0.1.3 -utf8-ranges-1.0.0 -vcpkg-0.2.2 -void-1.0.2 -walkdir-2.1.4 -winapi-0.2.8 -winapi-0.3.4 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -wincolor-0.1.6" - -inherit bash-completion-r1 cargo epatch versionator - -case "${CHOST}" in - armv7a*) - CARGOARCH=armv7 ;; - arm*) - CARGOARCH=arm ;; - *) - CARGOARCH=${CHOST%%-*} ;; -esac -case "${CHOST}" in - armv7a-hardfloat-*) - CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; - arm*) - CARGOLIBC=${CHOST##*-} ;; - *) - CARGOLIBC=${ELIBC/glibc/gnu} ;; -esac -CARGOHOST=${CARGOARCH}-unknown-${KERNEL}-${CARGOLIBC} -CARGO_SNAPSHOT_VERSION="0.$(($(get_version_component_range 2) - 0)).0" - -DESCRIPTION="The Rust's package manager" -HOMEPAGE="http://crates.io" -SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES}) - amd64? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-x86_64-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-x86_64-unknown-linux-musl.tar.xz ) - ) - arm? ( - elibc_glibc? ( - https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-arm-unknown-linux-gnueabi.tar.xz - https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz - ) - elibc_musl? ( - https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-arm-unknown-linux-musleabi.tar.xz - https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-armv7-unknown-linux-musleabihf.tar.xz - ) - ) - arm64? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-aarch64-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-aarch64-unknown-linux-musl.tar.xz ) - ) - x86? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-i686-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-i686-unknown-linux-musl.tar.xz ) - )" - -RESTRICT="mirror" -LICENSE="|| ( MIT Apache-2.0 )" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -IUSE="bash-completion doc libressl" - -COMMON_DEPEND=" - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - net-libs/http-parser:0/2.6.2 - net-libs/libssh2:= - net-misc/curl:=[ssl] - sys-libs/zlib:= -" -RDEPEND=" - ${COMMON_DEPEND} - !dev-util/cargo-bin -" -DEPEND=" - ${COMMON_DEPEND} - >=virtual/rust-1.9.0 - dev-util/cmake - sys-apps/coreutils - sys-apps/diffutils - sys-apps/findutils - sys-apps/sed" - -PATCHES=() - -src_prepare() { - default - - (cd ${WORKDIR} && epatch "${FILESDIR}/cargo26-libressl27.patch" || die "Could not apply patch") -} - -src_configure() { - # Do nothing - echo "Configuring cargo..." -} - -src_compile() { - export CARGO_HOME="${ECARGO_HOME}" - local cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo" - ${cargo} build --release || die - - # Building HTML documentation - use doc && ${cargo} doc -} - -src_install() { - dobin target/release/cargo - - # Install HTML documentation - use doc && HTML_DOCS=("target/doc") - einstalldocs - - use bash-completion && newbashcomp src/etc/cargo.bashcomp.sh cargo - insinto /usr/share/zsh/site-functions - doins src/etc/_cargo - doman src/etc/man/* -} diff --git a/dev-util/cargo/cargo-0.27.0.ebuild b/dev-util/cargo/cargo-0.27.0.ebuild deleted file mode 100644 index 4078b888..00000000 --- a/dev-util/cargo/cargo-0.27.0.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CRATES=" -aho-corasick-0.6.4 -ansi_term-0.11.0 -atty-0.2.9 -backtrace-0.3.6 -backtrace-sys-0.1.16 -bitflags-1.0.1 -bufstream-0.1.3 -cc-1.0.10 -cfg-if-0.1.2 -clap-2.31.2 -cmake-0.1.30 -commoncrypto-0.2.0 -commoncrypto-sys-0.2.0 -core-foundation-0.5.1 -core-foundation-sys-0.5.1 -crates-io-0.16.0 -crossbeam-0.3.2 -crypto-hash-0.3.1 -curl-0.4.12 -curl-sys-0.4.2 -dtoa-0.4.2 -env_logger-0.5.9 -failure-0.1.1 -failure_derive-0.1.1 -filetime-0.1.15 -filetime-0.2.0 -flate2-1.0.1 -fnv-1.0.6 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fs2-0.4.3 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -git2-0.7.1 -git2-curl-0.8.1 -glob-0.2.11 -globset-0.4.0 -hamcrest-0.1.1 -hex-0.3.2 -home-0.3.3 -humantime-1.1.1 -idna-0.1.4 -ignore-0.4.2 -itoa-0.4.1 -jobserver-0.1.11 -kernel32-sys-0.2.2 -lazy_static-1.0.0 -lazycell-0.6.0 -libc-0.2.40 -libgit2-sys-0.7.1 -libssh2-sys-0.2.6 -libz-sys-1.0.18 -log-0.4.1 -matches-0.1.6 -memchr-2.0.1 -miniz-sys-0.1.10 -miow-0.3.1 -num-traits-0.2.4 -num_cpus-1.8.0 -openssl-0.10.6 -openssl-probe-0.1.2 -openssl-sys-0.9.28 -percent-encoding-1.0.1 -pkg-config-0.3.11 -proc-macro2-0.3.7 -quick-error-1.2.1 -quote-0.3.15 -quote-0.5.2 -rand-0.4.2 -redox_syscall-0.1.37 -redox_termios-0.1.1 -regex-0.2.11 -regex-1.0.0 -regex-syntax-0.5.6 -regex-syntax-0.6.0 -remove_dir_all-0.5.1 -rustc-demangle-0.1.8 -same-file-1.0.2 -schannel-0.1.12 -scopeguard-0.3.3 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.55 -serde_derive-1.0.55 -serde_ignored-0.0.4 -serde_json-1.0.17 -shell-escape-0.1.4 -socket2-0.3.5 -strsim-0.7.0 -syn-0.11.11 -syn-0.13.10 -synom-0.11.3 -synstructure-0.6.1 -tar-0.4.15 -tempfile-3.0.2 -termcolor-0.3.6 -termion-1.5.1 -textwrap-0.9.0 -thread_local-0.3.5 -toml-0.4.6 -ucd-util-0.1.1 -unicode-bidi-0.3.4 -unicode-normalization-0.1.7 -unicode-width-0.1.4 -unicode-xid-0.0.4 -unicode-xid-0.1.0 -unreachable-1.0.0 -url-1.7.0 -utf8-ranges-1.0.0 -vcpkg-0.2.3 -vec_map-0.8.1 -void-1.0.2 -walkdir-2.1.4 -winapi-0.2.8 -winapi-0.3.4 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -wincolor-0.1.6" - -inherit bash-completion-r1 cargo epatch versionator - -case "${CHOST}" in - armv7a*) - CARGOARCH=armv7 ;; - arm*) - CARGOARCH=arm ;; - *) - CARGOARCH=${CHOST%%-*} ;; -esac -case "${CHOST}" in - armv7a-hardfloat-*) - CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; - arm*) - CARGOLIBC=${CHOST##*-} ;; - *) - CARGOLIBC=${ELIBC/glibc/gnu} ;; -esac -CARGOHOST=${CARGOARCH}-unknown-${KERNEL}-${CARGOLIBC} -CARGO_SNAPSHOT_VERSION="0.$(($(get_version_component_range 2) - 0)).0" - -DESCRIPTION="The Rust's package manager" -HOMEPAGE="http://crates.io" -SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES}) - amd64? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-x86_64-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-x86_64-unknown-linux-musl.tar.xz ) - ) - arm? ( - elibc_glibc? ( - https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-arm-unknown-linux-gnueabi.tar.xz - https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz - ) - elibc_musl? ( - https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-arm-unknown-linux-musleabi.tar.xz - https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-armv7-unknown-linux-musleabihf.tar.xz - ) - ) - arm64? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-aarch64-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-aarch64-unknown-linux-musl.tar.xz ) - ) - x86? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-i686-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-i686-unknown-linux-musl.tar.xz ) - )" - -RESTRICT="mirror" -LICENSE="|| ( MIT Apache-2.0 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -IUSE="bash-completion doc libressl" - -COMMON_DEPEND=" - 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:= -" -RDEPEND=" - ${COMMON_DEPEND} - !dev-util/cargo-bin -" -DEPEND=" - ${COMMON_DEPEND} - >=virtual/rust-1.9.0 - dev-util/cmake - sys-apps/coreutils - sys-apps/diffutils - sys-apps/findutils - sys-apps/sed" - -PATCHES=() - -src_prepare() { - default - - (cd ${WORKDIR} && epatch "${FILESDIR}/cargo27-libressl27.patch" || die "Could not apply patch") -} - -src_configure() { - # Do nothing - echo "Configuring cargo..." -} - -src_compile() { - export CARGO_HOME="${ECARGO_HOME}" - local cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo" - ${cargo} build --release || die - - # Building HTML documentation - use doc && ${cargo} doc -} - -src_install() { - dobin target/release/cargo - - # Install HTML documentation - use doc && HTML_DOCS=("target/doc") - einstalldocs - - use bash-completion && newbashcomp src/etc/cargo.bashcomp.sh cargo - insinto /usr/share/zsh/site-functions - doins src/etc/_cargo - doman src/etc/man/* -} diff --git a/dev-util/cargo/cargo-0.28.0.ebuild b/dev-util/cargo/cargo-0.28.0.ebuild deleted file mode 100644 index 1005c195..00000000 --- a/dev-util/cargo/cargo-0.28.0.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CRATES=" -aho-corasick-0.6.4 -ansi_term-0.11.0 -atty-0.2.10 -backtrace-0.3.7 -backtrace-sys-0.1.16 -bitflags-1.0.3 -bufstream-0.1.3 -cargo-0.28.0 -cc-1.0.15 -cfg-if-0.1.3 -clap-2.31.2 -cmake-0.1.31 -commoncrypto-0.2.0 -commoncrypto-sys-0.2.0 -core-foundation-0.5.1 -core-foundation-sys-0.5.1 -crates-io-0.16.0 -crossbeam-0.3.2 -crypto-hash-0.3.1 -curl-0.4.12 -curl-sys-0.4.5 -dtoa-0.4.2 -env_logger-0.5.10 -failure-0.1.1 -failure_derive-0.1.1 -filetime-0.2.1 -flate2-1.0.1 -fnv-1.0.6 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fs2-0.4.3 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -git2-0.7.1 -git2-curl-0.8.1 -glob-0.2.11 -globset-0.4.0 -hex-0.3.2 -home-0.3.3 -humantime-1.1.1 -idna-0.1.4 -ignore-0.4.2 -itoa-0.4.1 -jobserver-0.1.11 -kernel32-sys-0.2.2 -lazy_static-1.0.0 -lazycell-0.6.0 -libc-0.2.40 -libgit2-sys-0.7.1 -libssh2-sys-0.2.7 -libz-sys-1.0.18 -log-0.4.1 -matches-0.1.6 -memchr-2.0.1 -miniz-sys-0.1.10 -miow-0.3.1 -num-traits-0.2.4 -num_cpus-1.8.0 -openssl-0.10.7 -openssl-probe-0.1.2 -openssl-sys-0.9.30 -percent-encoding-1.0.1 -pkg-config-0.3.11 -proc-macro2-0.3.8 -quick-error-1.2.1 -quote-0.3.15 -quote-0.5.2 -rand-0.4.2 -redox_syscall-0.1.37 -redox_termios-0.1.1 -regex-0.2.11 -regex-1.0.0 -regex-syntax-0.5.6 -regex-syntax-0.6.0 -remove_dir_all-0.5.1 -rustc-demangle-0.1.8 -same-file-1.0.2 -schannel-0.1.12 -scopeguard-0.3.3 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.55 -serde_derive-1.0.55 -serde_ignored-0.0.4 -serde_json-1.0.17 -shell-escape-0.1.4 -socket2-0.3.5 -strsim-0.7.0 -syn-0.11.11 -syn-0.13.10 -synom-0.11.3 -synstructure-0.6.1 -tar-0.4.15 -tempfile-3.0.2 -termcolor-0.3.6 -termion-1.5.1 -textwrap-0.9.0 -thread_local-0.3.5 -toml-0.4.6 -ucd-util-0.1.1 -unicode-bidi-0.3.4 -unicode-normalization-0.1.7 -unicode-width-0.1.4 -unicode-xid-0.0.4 -unicode-xid-0.1.0 -unreachable-1.0.0 -url-1.7.0 -utf8-ranges-1.0.0 -vcpkg-0.2.3 -vec_map-0.8.1 -void-1.0.2 -walkdir-2.1.4 -winapi-0.2.8 -winapi-0.3.4 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -wincolor-0.1.6" - -inherit bash-completion-r1 cargo epatch versionator - -case "${CHOST}" in - armv7a*) - CARGOARCH=armv7 ;; - arm*) - CARGOARCH=arm ;; - *) - CARGOARCH=${CHOST%%-*} ;; -esac -case "${CHOST}" in - armv7a-hardfloat-*) - CARGOLIBC=${ELIBC/glibc/gnu}eabihf ;; - arm*) - CARGOLIBC=${CHOST##*-} ;; - *) - CARGOLIBC=${ELIBC/glibc/gnu} ;; -esac -CARGOHOST=${CARGOARCH}-unknown-${KERNEL}-${CARGOLIBC} -CARGO_SNAPSHOT_VERSION="0.$(($(get_version_component_range 2) - 0)).0" - -DESCRIPTION="The Rust's package manager" -HOMEPAGE="http://crates.io" -SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES}) - amd64? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-x86_64-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-x86_64-unknown-linux-musl.tar.xz ) - ) - arm? ( - elibc_glibc? ( - https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-arm-unknown-linux-gnueabi.tar.xz - https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz - ) - elibc_musl? ( - https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-arm-unknown-linux-musleabi.tar.xz - https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-armv7-unknown-linux-musleabihf.tar.xz - ) - ) - arm64? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-aarch64-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-aarch64-unknown-linux-musl.tar.xz ) - ) - x86? ( - elibc_glibc? ( https://static.rust-lang.org/dist/cargo-${CARGO_SNAPSHOT_VERSION}-i686-unknown-linux-gnu.tar.xz ) - elibc_musl? ( https://portage.smaeul.xyz/distfiles/cargo-${CARGO_SNAPSHOT_VERSION}-i686-unknown-linux-musl.tar.xz ) - )" - -RESTRICT="mirror" -LICENSE="|| ( MIT Apache-2.0 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -IUSE="bash-completion doc libressl" - -COMMON_DEPEND=" - 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:= -" -RDEPEND=" - ${COMMON_DEPEND} - !dev-util/cargo-bin -" -DEPEND=" - ${COMMON_DEPEND} - >=virtual/rust-1.9.0 - dev-util/cmake - sys-apps/coreutils - sys-apps/diffutils - sys-apps/findutils - sys-apps/sed" - -PATCHES=() - -src_prepare() { - default - - (cd ${WORKDIR} && epatch "${FILESDIR}/cargo27-libressl27.patch" || die "Could not apply patch") -} - -src_configure() { - # Do nothing - echo "Configuring cargo..." -} - -src_compile() { - export CARGO_HOME="${ECARGO_HOME}" - local cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo" - ${cargo} build --release || die - - # Building HTML documentation - use doc && ${cargo} doc -} - -src_install() { - dobin target/release/cargo - - # Install HTML documentation - use doc && HTML_DOCS=("target/doc") - einstalldocs - - use bash-completion && newbashcomp src/etc/cargo.bashcomp.sh cargo - insinto /usr/share/zsh/site-functions - doins src/etc/_cargo - doman src/etc/man/* -} diff --git a/dev-util/cargo/files/cargo26-libressl27.patch b/dev-util/cargo/files/cargo26-libressl27.patch deleted file mode 100644 index ec9e3642..00000000 --- a/dev-util/cargo/files/cargo26-libressl27.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/cargo_home/gentoo/libgit2-sys-0.6.19/libgit2/src/openssl_stream.c 2018-05-07 18:50:07 UTC -+++ b/cargo_home/gentoo/libgit2-sys-0.6.19/libgit2/src/openssl_stream.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/cargo_home/gentoo/libgit2-sys-0.6.19/libgit2/src/openssl_stream.h 2018-05-07 18:50:07 UTC -+++ b/cargo_home/gentoo/libgit2-sys-0.6.19/libgit2/src/openssl_stream.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-util/cargo/files/cargo27-libressl27.patch b/dev-util/cargo/files/cargo27-libressl27.patch deleted file mode 100644 index 4eb9f46a..00000000 --- a/dev-util/cargo/files/cargo27-libressl27.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/cargo_home/gentoo/libgit2-sys-0.7.1/libgit2/src/streams/openssl.c 2018-05-07 18:50:07 UTC -+++ b/cargo_home/gentoo/libgit2-sys-0.7.1/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/cargo_home/gentoo/libgit2-sys-0.7.1/libgit2/src/streams/openssl.h 2018-05-07 18:50:07 UTC -+++ b/cargo_home/gentoo/libgit2-sys-0.7.1/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-util/cargo/metadata.xml b/dev-util/cargo/metadata.xml deleted file mode 100644 index b74fce00..00000000 --- a/dev-util/cargo/metadata.xml +++ /dev/null @@ -1,11 +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> - <upstream> - <remote-id type="github">rust-lang/cargo</remote-id> - </upstream> -</pkgmetadata> |