diff options
| -rw-r--r-- | dev-lang/rust/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.34.0-doc-build-fix.patch | 442 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.34.0-libressl.patch | 29 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.34.2-fix-custom-libdir.patch | 36 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch | 117 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.36.0-libressl.patch | 42 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.36.0-libressl3.patch | 72 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.37.0-r314.ebuild (renamed from dev-lang/rust/rust-1.34.2-r1337.ebuild) | 51 |
8 files changed, 294 insertions, 499 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 6882731e..e535c2b3 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -1,2 +1,2 @@ -DIST rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz 155298128 BLAKE2B af5bc628bc054bd354d5af78e53cd2ffbfbdf2c2d3a3e58eeb593f148c54024fa5905aa53a69c514d6d41e48688697e1ce8adb866817c77cdf541399f6e7956f SHA512 b7f3087f34e99517cd729f5ff1f8cce3f3254cb36c734d5b90d878293e4406934c2f597bf7e2941e9257046f62c9274eb4769a64dabfbc5f0bbf2a1703f7fef8 -DIST rustc-1.34.2-src.tar.xz 95048792 BLAKE2B e81e4bfda87ddfb09ab8a74792346970aa440c678d2bb1279c329db4929282f761ada6fea9d81ceeecfd513613025c8e636487626fc36bd0b33559e045bb1b15 SHA512 f1bd2b226d90aae8a4657e6117b9a8451d4ce8129f79cc0fce0da7613a3b7800e690bc0ede8fec20a2f5f32c13fa8e22ac97d3838e0d36936793535a75d9c381 +DIST rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz 169600936 BLAKE2B 8bf075f2b5624e4716e3058512b85b70e72ec6f0c8ce8fc38857612b02aa5702a1bb447f13f882a1b96b1f32330d0a8f7f1f1db81827b51cb7429195e070a5a3 SHA512 3f14dda1e09ef8c8168600f4d70ba60cb2a1086ad9edb5eed708d0ffc16fdb9c582ce350a93afcd64b78f87737e37d4f099703835a1ec9837a5721c2335e17c7 +DIST rustc-1.37.0-src.tar.xz 98654252 BLAKE2B ddee92c7959a0e1ee11ffe5ded6017703cfac7bbf2a00dc46c37ed28f1cd1d31e1d5b62cc1a5ae2d55d64f8705d0cb282f4968deddf36c3152e5e0cfdfbea67d SHA512 bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4 diff --git a/dev-lang/rust/files/1.34.0-doc-build-fix.patch b/dev-lang/rust/files/1.34.0-doc-build-fix.patch deleted file mode 100644 index 52b8d6ea..00000000 --- a/dev-lang/rust/files/1.34.0-doc-build-fix.patch +++ /dev/null @@ -1,442 +0,0 @@ -From 9efc93c96dd6746460cef916d307b72ba21a7fd0 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov <mark.simulacrum@gmail.com> -Date: Sun, 3 Mar 2019 09:29:59 -0700 -Subject: [PATCH 1/2] Tools built by the bootstrap compiler must be built by it - -This avoids building compilers that we don't need -- most tools will work -just fine with the downloaded compiler. ---- - src/bootstrap/doc.rs | 6 ++- - src/bootstrap/test.rs | 10 ++-- - src/bootstrap/tool.rs | 104 +++++++++++++++++++++++++++--------------- - 3 files changed, 78 insertions(+), 42 deletions(-) - -diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs -index e0ad0422a6ce..621e3a95473e 100644 ---- a/src/bootstrap/doc.rs -+++ b/src/bootstrap/doc.rs -@@ -883,7 +883,11 @@ impl Step for ErrorIndex { - builder.info(&format!("Documenting error index ({})", target)); - let out = builder.doc_out(target); - t!(fs::create_dir_all(&out)); -- let mut index = builder.tool_cmd(Tool::ErrorIndex); -+ let compiler = builder.compiler(2, builder.config.build); -+ let mut index = tool::ErrorIndex::command( -+ builder, -+ compiler, -+ ); - index.arg("html"); - index.arg(out.join("error-index.html")); - -diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index 51412f79c3d0..5abf9d699784 100644 ---- a/src/bootstrap/test.rs -+++ b/src/bootstrap/test.rs -@@ -414,7 +414,6 @@ impl Step for Miri { - - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub struct CompiletestTest { -- stage: u32, - host: Interned<String>, - } - -@@ -427,16 +426,14 @@ impl Step for CompiletestTest { - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure(CompiletestTest { -- stage: run.builder.top_stage, - host: run.target, - }); - } - - /// Runs `cargo test` for compiletest. - fn run(self, builder: &Builder<'_>) { -- let stage = self.stage; - let host = self.host; -- let compiler = builder.compiler(stage, host); -+ let compiler = builder.compiler(0, host); - - let mut cargo = tool::prepare_tool_cargo(builder, - compiler, -@@ -1426,7 +1423,10 @@ impl Step for ErrorIndex { - t!(fs::create_dir_all(&dir)); - let output = dir.join("error-index.md"); - -- let mut tool = builder.tool_cmd(Tool::ErrorIndex); -+ let mut tool = tool::ErrorIndex::command( -+ builder, -+ builder.compiler(compiler.stage, builder.config.build), -+ ); - tool.arg("markdown") - .arg(&output) - .env("CFG_BUILD", &builder.config.build) -diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index fc1a17d54667..4f2aa0b795dc 100644 ---- a/src/bootstrap/tool.rs -+++ b/src/bootstrap/tool.rs -@@ -250,9 +250,9 @@ pub fn prepare_tool_cargo( - cargo - } - --macro_rules! tool { -+macro_rules! bootstrap_tool { - ($( -- $name:ident, $path:expr, $tool_name:expr, $mode:expr -+ $name:ident, $path:expr, $tool_name:expr - $(,llvm_tools = $llvm:expr)* - $(,is_external_tool = $external:expr)* - ; -@@ -266,10 +266,7 @@ macro_rules! tool { - - impl Tool { - pub fn get_mode(&self) -> Mode { -- let mode = match self { -- $(Tool::$name => $mode,)+ -- }; -- mode -+ Mode::ToolBootstrap - } - - /// Whether this tool requires LLVM to run -@@ -282,27 +279,15 @@ macro_rules! tool { - - impl<'a> Builder<'a> { - pub fn tool_exe(&self, tool: Tool) -> PathBuf { -- let stage = self.tool_default_stage(tool); - match tool { - $(Tool::$name => - self.ensure($name { -- compiler: self.compiler(stage, self.config.build), -+ compiler: self.compiler(0, self.config.build), - target: self.config.build, - }), - )+ - } - } -- -- pub fn tool_default_stage(&self, tool: Tool) -> u32 { -- // Compile the error-index in the same stage as rustdoc to avoid -- // recompiling rustdoc twice if we can. Otherwise compile -- // everything else in stage0 as there's no need to rebootstrap -- // everything. -- match tool { -- Tool::ErrorIndex if self.top_stage >= 2 => self.top_stage, -- _ => 0, -- } -- } - } - - $( -@@ -321,7 +306,8 @@ macro_rules! tool { - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure($name { -- compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), -+ // snapshot compiler -+ compiler: run.builder.compiler(0, run.builder.config.build), - target: run.target, - }); - } -@@ -331,7 +317,7 @@ macro_rules! tool { - compiler: self.compiler, - target: self.target, - tool: $tool_name, -- mode: $mode, -+ mode: Mode::ToolBootstrap, - path: $path, - is_optional_tool: false, - source_type: if false $(|| $external)* { -@@ -347,21 +333,67 @@ macro_rules! tool { - } - } - --tool!( -- Rustbook, "src/tools/rustbook", "rustbook", Mode::ToolBootstrap; -- ErrorIndex, "src/tools/error_index_generator", "error_index_generator", Mode::ToolRustc; -- UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen", Mode::ToolBootstrap; -- Tidy, "src/tools/tidy", "tidy", Mode::ToolBootstrap; -- Linkchecker, "src/tools/linkchecker", "linkchecker", Mode::ToolBootstrap; -- CargoTest, "src/tools/cargotest", "cargotest", Mode::ToolBootstrap; -- Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap, llvm_tools = true; -- BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::ToolBootstrap; -- RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::ToolBootstrap; -- RustInstaller, "src/tools/rust-installer", "fabricate", Mode::ToolBootstrap, -- is_external_tool = true; -- RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes", Mode::ToolBootstrap; -+bootstrap_tool!( -+ Rustbook, "src/tools/rustbook", "rustbook"; -+ UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen"; -+ Tidy, "src/tools/tidy", "tidy"; -+ Linkchecker, "src/tools/linkchecker", "linkchecker"; -+ CargoTest, "src/tools/cargotest", "cargotest"; -+ Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true; -+ BuildManifest, "src/tools/build-manifest", "build-manifest"; -+ RemoteTestClient, "src/tools/remote-test-client", "remote-test-client"; -+ RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true; -+ RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes"; - ); - -+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] -+pub struct ErrorIndex { -+ pub compiler: Compiler, -+} -+ -+impl ErrorIndex { -+ pub fn command(builder: &Builder<'_>, compiler: Compiler) -> Command { -+ let mut cmd = Command::new(builder.ensure(ErrorIndex { -+ compiler -+ })); -+ add_lib_path( -+ vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))], -+ &mut cmd, -+ ); -+ cmd -+ } -+} -+ -+impl Step for ErrorIndex { -+ type Output = PathBuf; -+ -+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { -+ run.path("src/tools/error_index_generator") -+ } -+ -+ fn make_run(run: RunConfig<'_>) { -+ // Compile the error-index in the same stage as rustdoc to avoid -+ // recompiling rustdoc twice if we can. -+ let stage = if run.builder.top_stage >= 2 { run.builder.top_stage } else { 0 }; -+ run.builder.ensure(ErrorIndex { -+ compiler: run.builder.compiler(stage, run.builder.config.build), -+ }); -+ } -+ -+ fn run(self, builder: &Builder<'_>) -> PathBuf { -+ builder.ensure(ToolBuild { -+ compiler: self.compiler, -+ target: self.compiler.host, -+ tool: "error_index_generator", -+ mode: Mode::ToolRustc, -+ path: "src/tools/error_index_generator", -+ is_optional_tool: false, -+ source_type: SourceType::InTree, -+ extra_features: Vec::new(), -+ }).expect("expected to build -- essential tool") -+ } -+} -+ - #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] - pub struct RemoteTestServer { - pub compiler: Compiler, -@@ -625,7 +657,7 @@ impl<'a> Builder<'a> { - /// `host`. - pub fn tool_cmd(&self, tool: Tool) -> Command { - let mut cmd = Command::new(self.tool_exe(tool)); -- let compiler = self.compiler(self.tool_default_stage(tool), self.config.build); -+ let compiler = self.compiler(0, self.config.build); - self.prepare_tool_cmd(compiler, tool, &mut cmd); - cmd - } -@@ -637,7 +669,7 @@ impl<'a> Builder<'a> { - fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) { - let host = &compiler.host; - let mut lib_paths: Vec<PathBuf> = vec![ -- if compiler.stage == 0 && tool != Tool::ErrorIndex { -+ if compiler.stage == 0 { - self.build.rustc_snapshot_libdir() - } else { - PathBuf::from(&self.sysroot_libdir(compiler, compiler.host)) - -From 03718ed67a7b8fd57fc27316ec57ac3bc0f13d06 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov <mark.simulacrum@gmail.com> -Date: Sun, 3 Mar 2019 09:50:56 -0700 -Subject: [PATCH 2/2] Permit getting stage 0 rustdoc - -This allows us to e.g. test compiletest, including doctests, in stage 0 -without building a fresh compiler and rustdoc. ---- - src/bootstrap/builder.rs | 15 +++++++-------- - src/bootstrap/dist.rs | 2 +- - src/bootstrap/doc.rs | 8 ++++---- - src/bootstrap/test.rs | 8 ++++---- - src/bootstrap/tool.rs | 8 +++++--- - 5 files changed, 21 insertions(+), 20 deletions(-) - -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 7e6c0a9f52aa..f8b7f25a7543 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -668,20 +668,19 @@ impl<'a> Builder<'a> { - .map(|entry| entry.path()) - } - -- pub fn rustdoc(&self, host: Interned<String>) -> PathBuf { -- self.ensure(tool::Rustdoc { host }) -+ pub fn rustdoc(&self, compiler: Compiler) -> PathBuf { -+ self.ensure(tool::Rustdoc { compiler }) - } - -- pub fn rustdoc_cmd(&self, host: Interned<String>) -> Command { -+ pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command { - let mut cmd = Command::new(&self.out.join("bootstrap/debug/rustdoc")); -- let compiler = self.compiler(self.top_stage, host); - cmd.env("RUSTC_STAGE", compiler.stage.to_string()) - .env("RUSTC_SYSROOT", self.sysroot(compiler)) - // Note that this is *not* the sysroot_libdir because rustdoc must be linked - // equivalently to rustc. - .env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler)) - .env("CFG_RELEASE_CHANNEL", &self.config.channel) -- .env("RUSTDOC_REAL", self.rustdoc(host)) -+ .env("RUSTDOC_REAL", self.rustdoc(compiler)) - .env("RUSTDOC_CRATE_VERSION", self.rust_version()) - .env("RUSTC_BOOTSTRAP", "1"); - -@@ -689,7 +688,7 @@ impl<'a> Builder<'a> { - cmd.env_remove("MAKEFLAGS"); - cmd.env_remove("MFLAGS"); - -- if let Some(linker) = self.linker(host) { -+ if let Some(linker) = self.linker(compiler.host) { - cmd.env("RUSTC_TARGET_LINKER", linker); - } - cmd -@@ -751,7 +750,7 @@ impl<'a> Builder<'a> { - // This is the intended out directory for compiler documentation. - my_out = self.compiler_doc_out(target); - } -- let rustdoc = self.rustdoc(compiler.host); -+ let rustdoc = self.rustdoc(compiler); - self.clear_if_dirty(&my_out, &rustdoc); - } else if cmd != "test" { - match mode { -@@ -897,7 +896,7 @@ impl<'a> Builder<'a> { - .env( - "RUSTDOC_REAL", - if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) { -- self.rustdoc(compiler.host) -+ self.rustdoc(compiler) - } else { - PathBuf::from("/path/to/nowhere/rustdoc/not/required") - }, -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 2dae3f9135d8..3045cda125ee 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -479,7 +479,7 @@ impl Step for Rustc { - t!(fs::create_dir_all(image.join("bin"))); - builder.cp_r(&src.join("bin"), &image.join("bin")); - -- builder.install(&builder.rustdoc(compiler.host), &image.join("bin"), 0o755); -+ builder.install(&builder.rustdoc(compiler), &image.join("bin"), 0o755); - - // Copy runtime DLLs needed by the compiler - if libdir != "bin" { -diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs -index 621e3a95473e..ae329286486d 100644 ---- a/src/bootstrap/doc.rs -+++ b/src/bootstrap/doc.rs -@@ -335,7 +335,7 @@ fn invoke_rustdoc( - let footer = builder.src.join("src/doc/footer.inc"); - let version_info = out.join("version_info.html"); - -- let mut cmd = builder.rustdoc_cmd(compiler.host); -+ let mut cmd = builder.rustdoc_cmd(compiler); - - let out = out.join("book"); - -@@ -415,7 +415,7 @@ impl Step for Standalone { - } - - let html = out.join(filename).with_extension("html"); -- let rustdoc = builder.rustdoc(compiler.host); -+ let rustdoc = builder.rustdoc(compiler); - if up_to_date(&path, &html) && - up_to_date(&footer, &html) && - up_to_date(&favicon, &html) && -@@ -425,7 +425,7 @@ impl Step for Standalone { - continue - } - -- let mut cmd = builder.rustdoc_cmd(compiler.host); -+ let mut cmd = builder.rustdoc_cmd(compiler); - cmd.arg("--html-after-content").arg(&footer) - .arg("--html-before-content").arg(&version_info) - .arg("--html-in-header").arg(&favicon) -@@ -824,7 +824,7 @@ impl Step for Rustdoc { - builder.ensure(Rustc { stage, target }); - - // Build rustdoc. -- builder.ensure(tool::Rustdoc { host: compiler.host }); -+ builder.ensure(tool::Rustdoc { compiler: compiler }); - - // Symlink compiler docs to the output directory of rustdoc documentation. - let out_dir = builder.stage_out(compiler, Mode::ToolRustc) -diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index 5abf9d699784..6b9960c355c5 100644 ---- a/src/bootstrap/test.rs -+++ b/src/bootstrap/test.rs -@@ -177,7 +177,7 @@ impl Step for Cargotest { - cmd.arg(&builder.initial_cargo) - .arg(&out_dir) - .env("RUSTC", builder.rustc(compiler)) -- .env("RUSTDOC", builder.rustdoc(compiler.host)), -+ .env("RUSTDOC", builder.rustdoc(compiler)), - ); - } - } -@@ -560,7 +560,7 @@ impl Step for RustdocTheme { - builder.sysroot_libdir(self.compiler, self.compiler.host), - ) - .env("CFG_RELEASE_CHANNEL", &builder.config.channel) -- .env("RUSTDOC_REAL", builder.rustdoc(self.compiler.host)) -+ .env("RUSTDOC_REAL", builder.rustdoc(self.compiler)) - .env("RUSTDOC_CRATE_VERSION", builder.rust_version()) - .env("RUSTC_BOOTSTRAP", "1"); - if let Some(linker) = builder.linker(self.compiler.host) { -@@ -995,7 +995,7 @@ impl Step for Compiletest { - || (mode == "ui" && is_rustdoc_ui) - { - cmd.arg("--rustdoc-path") -- .arg(builder.rustdoc(compiler.host)); -+ .arg(builder.rustdoc(compiler)); - } - - cmd.arg("--src-base") -@@ -1451,7 +1451,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) -> - } - - builder.info(&format!("doc tests for: {}", markdown.display())); -- let mut cmd = builder.rustdoc_cmd(compiler.host); -+ let mut cmd = builder.rustdoc_cmd(compiler); - builder.add_rust_test_threads(&mut cmd); - cmd.arg("--test"); - cmd.arg(markdown); -diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index 4f2aa0b795dc..5fb83caac06c 100644 ---- a/src/bootstrap/tool.rs -+++ b/src/bootstrap/tool.rs -@@ -430,7 +430,9 @@ impl Step for RemoteTestServer { - - #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] - pub struct Rustdoc { -- pub host: Interned<String>, -+ /// This should only ever be 0 or 2. -+ /// We sometimes want to reference the "bootstrap" rustdoc, which is why this option is here. -+ pub compiler: Compiler, - } - - impl Step for Rustdoc { -@@ -444,12 +446,12 @@ impl Step for Rustdoc { - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure(Rustdoc { -- host: run.host, -+ compiler: run.builder.compiler(run.builder.top_stage, run.host), - }); - } - - fn run(self, builder: &Builder<'_>) -> PathBuf { -- let target_compiler = builder.compiler(builder.top_stage, self.host); -+ let target_compiler = self.compiler; - if target_compiler.stage == 0 { - if !target_compiler.is_snapshot(builder) { - panic!("rustdoc in stage 0 must be snapshot rustdoc"); diff --git a/dev-lang/rust/files/1.34.0-libressl.patch b/dev-lang/rust/files/1.34.0-libressl.patch deleted file mode 100644 index d5705f88..00000000 --- a/dev-lang/rust/files/1.34.0-libressl.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/vendor/openssl-sys/.cargo-checksum.json b/vendor/openssl-sys/.cargo-checksum.json -index b5c539431..9428e81b1 100644 ---- a/vendor/openssl-sys/.cargo-checksum.json -+++ b/vendor/openssl-sys/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"b09af0445220130b1b1c45791a316435f7400cf2fab3abe9c419f4f8028cfb9c","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"fae5176c2b149d190c9611b58c5882312b5c0e483d1a404cfdf850473314a58f","build/main.rs":"c8bc352b94d05afeaeb96300341a695c70c3b62c46793a5c035aaf42e22b69d1","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"4f12d2f4c2a493888db669d1ecfd55df40861a78cae65957f801ed91dc2cae30","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"29aa053b67b47515fd15812aa0a90ff35dd9fa347da2beeba96d6deafeb9d945","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"520b282b92fa372a75bc16696dc3ee7a9a5752e517a18862182a3e9f5a976d28","src/dsa.rs":"3c294c5c45235497396ac803b723b3a0cb5bd3609f5dec18338b5b014c2adeb9","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"b22d27b01a70652384866b3d0d01d2f7a0421b2ba2db9268ed379fef4b1ac034","src/err.rs":"81230711e081277e0b6dae4ff21266052d075688c758c2b0720001849ef9192d","src/evp.rs":"13a8a71154545d7c478e156edb21beb219824937aba6b29c6bc6ef895c735a3d","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"17b5a1faa0fe3ab777c8cb0039a3dffd8922b211bf1330c2cd0c3e02f624353c","src/macros.rs":"a7c95174fd4cfeb42f730c7c0744194009520249888dbf43968571219fd6dfa1","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"619177f939328597e4bcf9c41fdf4d0aa9207d779c6e0dafddbe2eab9b1a6a98","src/pem.rs":"3ae1c53dbc126a04c188575294111cc04c215c2f3e031192d5cc05952f011ddf","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"a0bf64f1f8ff9f6e5dbed6c38d8fa2d3d1c5dfcfe6dd3ff79f7737b072ce4681","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"e69d3b9b8f2f8ae1ed3905a4dbe064ad1b7c1eaf21d7eabb86ecdb5b41e2120a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"fd85a1683064def0a9e07d803b90102229adc1d58fa19cf4e56976f0dd7425b9","src/x509.rs":"839be2feb74755ab7df66a024ad27dfa70ce4f7889229d9152ba999f3a54b914","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"66fd646ea4caf5ce81e3c881e88d85462519c4e97a7f82e82ca8ac52ea830ad2"},"package":"1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"} -\ No newline at end of file -+{"files":{"Cargo.toml":"b09af0445220130b1b1c45791a316435f7400cf2fab3abe9c419f4f8028cfb9c","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"fae5176c2b149d190c9611b58c5882312b5c0e483d1a404cfdf850473314a58f","build/main.rs":"45da6667bd8b1a35354ee1636df0b55f9d13d4ae45dd1fef5cf17c615c372bfd","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"4f12d2f4c2a493888db669d1ecfd55df40861a78cae65957f801ed91dc2cae30","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"29aa053b67b47515fd15812aa0a90ff35dd9fa347da2beeba96d6deafeb9d945","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"520b282b92fa372a75bc16696dc3ee7a9a5752e517a18862182a3e9f5a976d28","src/dsa.rs":"3c294c5c45235497396ac803b723b3a0cb5bd3609f5dec18338b5b014c2adeb9","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"b22d27b01a70652384866b3d0d01d2f7a0421b2ba2db9268ed379fef4b1ac034","src/err.rs":"81230711e081277e0b6dae4ff21266052d075688c758c2b0720001849ef9192d","src/evp.rs":"13a8a71154545d7c478e156edb21beb219824937aba6b29c6bc6ef895c735a3d","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"17b5a1faa0fe3ab777c8cb0039a3dffd8922b211bf1330c2cd0c3e02f624353c","src/macros.rs":"a7c95174fd4cfeb42f730c7c0744194009520249888dbf43968571219fd6dfa1","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"619177f939328597e4bcf9c41fdf4d0aa9207d779c6e0dafddbe2eab9b1a6a98","src/pem.rs":"3ae1c53dbc126a04c188575294111cc04c215c2f3e031192d5cc05952f011ddf","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"a0bf64f1f8ff9f6e5dbed6c38d8fa2d3d1c5dfcfe6dd3ff79f7737b072ce4681","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"e69d3b9b8f2f8ae1ed3905a4dbe064ad1b7c1eaf21d7eabb86ecdb5b41e2120a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"fd85a1683064def0a9e07d803b90102229adc1d58fa19cf4e56976f0dd7425b9","src/x509.rs":"839be2feb74755ab7df66a024ad27dfa70ce4f7889229d9152ba999f3a54b914","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"66fd646ea4caf5ce81e3c881e88d85462519c4e97a7f82e82ca8ac52ea830ad2"},"package":"1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"} -diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs -index 69def400e..08cc96eb9 100644 ---- a/vendor/openssl-sys/build/main.rs -+++ b/vendor/openssl-sys/build/main.rs -@@ -505,6 +505,7 @@ See rust-openssl README for more information: - (8, 1) => ('8', '1'), - (8, _) => ('8', 'x'), - (9, 0) => ('9', '0'), -+ (9, _) => ('9', 'x'), - _ => version_error(), - }; - -@@ -545,7 +546,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 --through 2.9.0, but a different version of OpenSSL was found. The build is now aborting -+through 2.9.x, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " diff --git a/dev-lang/rust/files/1.34.2-fix-custom-libdir.patch b/dev-lang/rust/files/1.34.2-fix-custom-libdir.patch new file mode 100644 index 00000000..2856d98c --- /dev/null +++ b/dev-lang/rust/files/1.34.2-fix-custom-libdir.patch @@ -0,0 +1,36 @@ +From c1aa2a464ed1a0fa2430a1e604fe6a3b9d785048 Mon Sep 17 00:00:00 2001 +From: O01eg <o01eg@yandex.ru> +Date: Mon, 8 Jul 2019 22:49:24 +0300 +Subject: [PATCH] Fix double resolving custom libdir + +--- + src/bootstrap/dist.rs | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index 45bc77ec97d4..5ddd1c3da949 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -485,7 +485,9 @@ impl Step for Rustc { + let name = entry.file_name(); + if let Some(s) = name.to_str() { + if is_dylib(s) { +- builder.install(&entry.path(), &image.join(&libdir_relative), 0o644); ++ // Don't use custom libdir here because ^lib/ will be resolved again ++ // with installer ++ builder.install(&entry.path(), &image.join("lib"), 0o644); + } + } + } +@@ -493,8 +495,9 @@ impl Step for Rustc { + + // Copy over the codegen backends + let backends_src = builder.sysroot_codegen_backends(compiler); +- let backends_rel = backends_src.strip_prefix(&src).unwrap(); +- let backends_dst = image.join(&backends_rel); ++ let backends_rel = backends_src.strip_prefix(&libdir).unwrap(); ++ // Don't use custom libdir here because ^lib/ will be resolved again with installer ++ let backends_dst = image.join("lib").join(&backends_rel); + t!(fs::create_dir_all(&backends_dst)); + builder.cp_r(&backends_src, &backends_dst); + diff --git a/dev-lang/rust/files/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch b/dev-lang/rust/files/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch new file mode 100644 index 00000000..1c6c8ca4 --- /dev/null +++ b/dev-lang/rust/files/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch @@ -0,0 +1,117 @@ +From d6bd0a479ceaf6abdd696c3b955a56f66275c562 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sat, 25 May 2019 22:21:16 -0700 +Subject: [PATCH] revert commits triggering multiple llvm rebuilds + +this reverts the following commits +https://github.com/rust-lang/rust/commit/105692c3ad281c63bf0f75a26a66bb9cff5b4553 +https://github.com/rust-lang/rust/commit/975ba58f42b34ff07cd7c2bd73350daed2057186 +https://github.com/rust-lang/rust/commit/e1daa36ba7df88788c2684bbe5ff6eb37f1cda69 +--- + src/bootstrap/llvm-rebuild-trigger | 4 +++ + src/bootstrap/native.rs | 46 +++++++++++++----------------- + 2 files changed, 24 insertions(+), 26 deletions(-) + create mode 100644 src/bootstrap/llvm-rebuild-trigger + +diff --git a/src/bootstrap/llvm-rebuild-trigger b/src/bootstrap/llvm-rebuild-trigger +new file mode 100644 +index 0000000000..0f18c6a4ac +--- /dev/null ++++ b/src/rustllvm/llvm-rebuild-trigger +@@ -0,0 +1,4 @@ ++# If this file is modified, then llvm will be (optionally) cleaned and then rebuilt. ++# The actual contents of this file do not matter, but to trigger a change on the ++# build bots then the contents should be changed so git updates the mtime. ++2019-03-18 +diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs +index fde40b0d1b..3babbc9e10 100644 +--- a/src/bootstrap/native.rs ++++ b/src/bootstrap/native.rs +@@ -67,40 +67,30 @@ impl Step for Llvm { + } + } + +- let (llvm_info, root, out_dir, llvm_config_ret_dir) = if emscripten { +- let info = &builder.emscripten_llvm_info; ++ let rebuild_trigger = builder.src.join("src/rustllvm/llvm-rebuild-trigger"); ++ let rebuild_trigger_contents = t!(fs::read_to_string(&rebuild_trigger)); ++ ++ let (out_dir, llvm_config_ret_dir) = if emscripten { + let dir = builder.emscripten_llvm_out(target); + let config_dir = dir.join("bin"); +- (info, "src/llvm-emscripten", dir, config_dir) ++ (dir, config_dir) + } else { +- let info = &builder.in_tree_llvm_info; + let mut dir = builder.llvm_out(builder.config.build); + if !builder.config.build.contains("msvc") || builder.config.ninja { + dir.push("build"); + } +- (info, "src/llvm-project/llvm", builder.llvm_out(target), dir.join("bin")) ++ (builder.llvm_out(target), dir.join("bin")) + }; +- +- if !llvm_info.is_git() { +- println!( +- "git could not determine the LLVM submodule commit hash. \ +- Assuming that an LLVM build is necessary.", +- ); +- } +- ++ let done_stamp = out_dir.join("llvm-finished-building"); + let build_llvm_config = llvm_config_ret_dir + .join(exe("llvm-config", &*builder.config.build)); +- let done_stamp = out_dir.join("llvm-finished-building"); +- +- if let Some(llvm_commit) = llvm_info.sha() { +- if done_stamp.exists() { +- let done_contents = t!(fs::read(&done_stamp)); ++ if done_stamp.exists() { ++ let done_contents = t!(fs::read_to_string(&done_stamp)); + +- // If LLVM was already built previously and the submodule's commit didn't change +- // from the previous build, then no action is required. +- if done_contents == llvm_commit.as_bytes() { +- return build_llvm_config +- } ++ // If LLVM was already built previously and contents of the rebuild-trigger file ++ // didn't change from the previous build, then no action is required. ++ if done_contents == rebuild_trigger_contents { ++ return build_llvm_config + } + } + +@@ -111,6 +101,7 @@ impl Step for Llvm { + t!(fs::create_dir_all(&out_dir)); + + // http://llvm.org/docs/CMake.html ++ let root = if self.emscripten { "src/llvm-emscripten" } else { "src/llvm-project/llvm" }; + let mut cfg = cmake::Config::new(builder.src.join(root)); + + let profile = match (builder.config.llvm_optimize, builder.config.llvm_release_debuginfo) { +@@ -251,6 +242,11 @@ impl Step for Llvm { + channel::CFG_RELEASE_NUM, + builder.config.channel, + ); ++ let llvm_info = if self.emscripten { ++ &builder.emscripten_llvm_info ++ } else { ++ &builder.in_tree_llvm_info ++ }; + if let Some(sha) = llvm_info.sha_short() { + default_suffix.push_str("-"); + default_suffix.push_str(sha); +@@ -283,9 +279,7 @@ impl Step for Llvm { + + cfg.build(); + +- if let Some(llvm_commit) = llvm_info.sha() { +- t!(fs::write(&done_stamp, llvm_commit)); +- } ++ t!(fs::write(&done_stamp, &rebuild_trigger_contents)); + + build_llvm_config + } +-- +2.21.0 + diff --git a/dev-lang/rust/files/1.36.0-libressl.patch b/dev-lang/rust/files/1.36.0-libressl.patch new file mode 100644 index 00000000..9b176f4d --- /dev/null +++ b/dev-lang/rust/files/1.36.0-libressl.patch @@ -0,0 +1,42 @@ +From e6f2c934bc25ec04a61c58c3e0ffb9c5194ee388 Mon Sep 17 00:00:00 2001 +From: Jory Pratt <anarchy@gentoo.org> +Date: Tue, 9 Jul 2019 09:48:36 -0500 +Subject: [PATCH] Update libressl support + +--- + vendor/openssl-sys/.cargo-checksum.json | 2 +- + vendor/openssl-sys/build/main.rs | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/vendor/openssl-sys/.cargo-checksum.json b/vendor/openssl-sys/.cargo-checksum.json +index 5c961bcbc..8430a26c5 100644 +--- a/vendor/openssl-sys/.cargo-checksum.json ++++ b/vendor/openssl-sys/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"681a1f8a8f389c82bbd3d2498a3692c201c63db658e7c3d162f09d5d81892fd4","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"cae729f449030ee86fc8e97215a2639c03f87a44d2399c84be8d41c1a6b624f3","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} +\ No newline at end of file +diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs +index 02b93b90a..0b8c96dcc 100644 +--- a/vendor/openssl-sys/build/main.rs ++++ b/vendor/openssl-sys/build/main.rs +@@ -199,6 +199,7 @@ See rust-openssl README for more information: + (8, 1) => ('8', '1'), + (8, _) => ('8', 'x'), + (9, 0) => ('9', '0'), ++ (9, _) => ('9', 'x'), + _ => version_error(), + }; + +@@ -239,7 +240,7 @@ fn version_error() -> ! { + " + + This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 +-through 2.9.0, but a different version of OpenSSL was found. The build is now aborting ++through 2.9.x, but a different version of OpenSSL was found. The build is now aborting + due to this version mismatch. + + " +-- +2.22.0 diff --git a/dev-lang/rust/files/1.36.0-libressl3.patch b/dev-lang/rust/files/1.36.0-libressl3.patch new file mode 100644 index 00000000..ec3cc10f --- /dev/null +++ b/dev-lang/rust/files/1.36.0-libressl3.patch @@ -0,0 +1,72 @@ +From 4ab0354f7432abcf0b598b475f4616b6aa5d36d4 Mon Sep 17 00:00:00 2001 +From: Steven Fackler <sfackler@gmail.com> +Date: Thu, 15 Aug 2019 23:30:58 -0500 +Subject: [PATCH] Support LibreSSL 3.0.0 + +Signed-off-by: Jory Pratt <anarchy@gentoo.org> +--- + vendor/openssl-sys/.cargo-checksum.json | 2 +- + vendor/openssl-sys/build/main.rs | 34 +++++++++++++------------ + 2 files changed, 19 insertions(+), 17 deletions(-) + +diff --git a/vendor/openssl-sys/.cargo-checksum.json b/vendor/openssl-sys/.cargo-checksum.json +index 8430a26c5..69d8b9a0b 100644 +--- a/vendor/openssl-sys/.cargo-checksum.json ++++ b/vendor/openssl-sys/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"cae729f449030ee86fc8e97215a2639c03f87a44d2399c84be8d41c1a6b624f3","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"a13d5b9a16af1f75f82ec4be15d2c60d39a3a56bca058aeba1fab35156c9ea38","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} +diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs +index 0b8c96dcc..0d9443551 100644 +--- a/vendor/openssl-sys/build/main.rs ++++ b/vendor/openssl-sys/build/main.rs +@@ -183,28 +183,30 @@ See rust-openssl README for more information: + if let Some(libressl_version) = libressl_version { + println!("cargo:libressl_version_number={:x}", libressl_version); + ++ let major = (libressl_version >> 28) as u8; + let minor = (libressl_version >> 20) as u8; + let fix = (libressl_version >> 12) as u8; +- let (minor, fix) = match (minor, fix) { +- (5, 0) => ('5', '0'), +- (5, 1) => ('5', '1'), +- (5, 2) => ('5', '2'), +- (5, _) => ('5', 'x'), +- (6, 0) => ('6', '0'), +- (6, 1) => ('6', '1'), +- (6, 2) => ('6', '2'), +- (6, _) => ('6', 'x'), +- (7, _) => ('7', 'x'), +- (8, 0) => ('8', '0'), +- (8, 1) => ('8', '1'), +- (8, _) => ('8', 'x'), +- (9, 0) => ('9', '0'), +- (9, _) => ('9', 'x'), ++ let (major, minor, fix) = match (major, minor, fix) { ++ (2, 5, 0) => ('2', '5', '0'), ++ (2, 5, 1) => ('2', '5', '1'), ++ (2, 5, 2) => ('2', '5', '2'), ++ (2, 5, _) => ('2', '5', 'x'), ++ (2, 6, 0) => ('2', '6', '0'), ++ (2, 6, 1) => ('2', '6', '1'), ++ (2, 6, 2) => ('2', '6', '2'), ++ (2, 6, _) => ('2', '6', 'x'), ++ (2, 7, _) => ('2', '7', 'x'), ++ (2, 8, 0) => ('2', '8', '0'), ++ (2, 8, 1) => ('2', '8', '1'), ++ (2, 8, _) => ('2', '8', 'x'), ++ (2, 9, 0) => ('2', '9', '0'), ++ (2, 9, _) => ('2', '9', 'x'), ++ (3, 0, 0) => ('3', '0', '0'), + _ => version_error(), + }; + + println!("cargo:libressl=true"); +- println!("cargo:libressl_version=2{}{}", minor, fix); ++ println!("cargo:libressl_version={}{}{}", major, minor, fix); + println!("cargo:version=101"); + Version::Libressl + } else { +-- +2.22.1 diff --git a/dev-lang/rust/rust-1.34.2-r1337.ebuild b/dev-lang/rust/rust-1.37.0-r314.ebuild index f11f1f90..b1738d00 100644 --- a/dev-lang/rust/rust-1.34.2-r1337.ebuild +++ b/dev-lang/rust/rust-1.37.0-r314.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) -inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs +inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs if [[ ${PV} = *beta* ]]; then betaver=${PV//*beta} @@ -14,7 +14,7 @@ if [[ ${PV} = *beta* ]]; then SLOT="beta/${PV}" SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" else - ABI_VER="1.34" + ABI_VER="1.37" SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" @@ -27,7 +27,7 @@ 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 - $(rust_arch_uri x86_64-unknown-linux-gnu rust-${RUST_STAGE0_VERSION})" + $(rust_arch_uri x86_64-unknown-linux-gnu rust-${RUST_STAGE0_VERSION})" ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore ) @@ -49,6 +49,7 @@ IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm LLVM_DEPEND=" || ( sys-devel/llvm:8[llvm_targets_WebAssembly?] + wasm? ( =sys-devel/lld-8* ) ) <sys-devel/llvm-9:= " @@ -72,10 +73,14 @@ DEPEND="${COMMON_DEPEND} >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) - dev-util/cmake" + dev-util/cmake +" + RDEPEND="${COMMON_DEPEND} !dev-util/cargo - rustfmt? ( !dev-util/rustfmt )" + rustfmt? ( !dev-util/rustfmt ) +" + REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 ) @@ -83,8 +88,10 @@ REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) PATCHES=( "${FILESDIR}"/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch - "${FILESDIR}"/1.34.0-doc-build-fix.patch - "${FILESDIR}"/1.34.0-libressl.patch # bug 684224 + "${FILESDIR}"/1.34.2-fix-custom-libdir.patch + "${FILESDIR}"/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch + "${FILESDIR}"/1.36.0-libressl.patch + "${FILESDIR}"/1.36.0-libressl3.patch ) S="${WORKDIR}/${MY_P}-src" @@ -120,12 +127,6 @@ src_prepare() { "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die - # ugly hack for https://bugs.gentoo.org/679806 - if use ppc64; then - sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die - export OPENSSL_ppccap=0 - fi - default } @@ -177,6 +178,7 @@ src_configure() { vendor = true extended = ${extended} tools = [${tools}] + verbose = 2 [install] prefix = "${EPREFIX}/usr" libdir = "$(get_libdir)/${P}" @@ -184,12 +186,12 @@ src_configure() { mandir = "share/${P}/man" [rust] optimize = $(toml_usex !debug) - debuginfo = $(toml_usex debug) + debug = $(toml_usex debug) debug-assertions = $(toml_usex debug) default-linker = "$(tc-getCC)" channel = "stable" rpath = false - lld = $(toml_usex wasm) + lld = $(usex system-llvm false $(toml_usex wasm)) EOF for v in $(multilib_get_enabled_abi_pairs); do @@ -217,21 +219,22 @@ src_configure() { if use wasm; then cat <<- EOF >> "${S}"/config.toml [target.wasm32-unknown-unknown] - linker = "rust-lld" + linker = "$(usex system-llvm lld rust-lld)" EOF fi } src_compile() { env $(cat "${S}"/config.env)\ - "${EPYTHON}" ./x.py build -v --config="${S}"/config.toml -j$(makeopts_jobs) \ + "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 } src_install() { local rust_target abi_libdir - env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || die + env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ + --exclude src/tools/miri || die # Copy shared library versions of standard libraries for all targets # into the system's abi-dependent lib directories because the rust @@ -242,9 +245,9 @@ src_install() { fi abi_libdir=$(get_abi_LIBDIR ${v##*.}) rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - mkdir -p "${ED}/usr/${abi_libdir}" + mkdir -p "${ED}/usr/${abi_libdir}/${P}" cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ - "${ED}/usr/${abi_libdir}" || die + "${ED}/usr/${abi_libdir}/${P}" || die done dodoc COPYRIGHT @@ -275,12 +278,8 @@ pkg_postinst() { 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 + eselect rust cleanup } |