diff options
| -rw-r--r-- | dev-lang/rust/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/rust/files/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch | 41 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.30.1-clippy-sysroot.patch | 62 | ||||
| -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/rust-1.34.2-r1337.ebuild (renamed from dev-lang/rust/rust-1.31.1-r1337.ebuild) | 117 |
6 files changed, 600 insertions, 95 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 1b6cc1de..6882731e 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -1,2 +1,2 @@ -DIST rust-1.30.1-x86_64-unknown-linux-gnu.tar.xz 145148116 BLAKE2B e70d667d880656209c036b72f619b1bd29679878ff4b8865f0453c064c4a8a53a96e73994509637312032e1260eeb0e53f7372ca1526760b1631846ed6a4c571 SHA512 05238b65b5184e3df81dbcf1cc1035a03054ef09a8563fe60877e4f078d0d2cad71aec73c1451196171f39f8e729059e91c7eed7b1402e03801c0b7e81815885 -DIST rustc-1.31.1-src.tar.xz 96915864 BLAKE2B bedfe1d56e2f99bb43b4b652d540aedf0a86c47b8493f28fb29e5af3135ff469ed40775bc2ee25ac5bd28a264ecba0094d7c9b6aae25ea365ed3e6f354ffa40b SHA512 d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02 +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 diff --git a/dev-lang/rust/files/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch b/dev-lang/rust/files/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch new file mode 100644 index 00000000..b33311c0 --- /dev/null +++ b/dev-lang/rust/files/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch @@ -0,0 +1,41 @@ +From 1f68002cb725c6a8fb5ca8425c1c86495a053f4f Mon Sep 17 00:00:00 2001 +From: Michal Gorny <mgorny@gentoo.org> +Date: Thu, 4 Apr 2019 14:21:38 +0000 +Subject: [PATCH] [llvm] [cmake] Add additional headers only if they exist + +Modify the add_header_files_for_glob() function to only add files +that do exist, rather than all matches of the glob. This fixes CMake +error when one of the include directories (which happen to include +/usr/include) contain broken symlinks. + +Differential Revision: https://reviews.llvm.org/D59632 + +llvm-svn: 357701 +--- + llvm/cmake/modules/LLVMProcessSources.cmake | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/LLVMProcessSources.cmake b/cmake/modules/LLVMProcessSources.cmake +index 7cbd2863500..d0be0e8b3ba 100644 +--- a/src/llvm-project/llvm/cmake/modules/LLVMProcessSources.cmake ++++ b/src/llvm-project/llvm/cmake/modules/LLVMProcessSources.cmake +@@ -30,7 +30,15 @@ endmacro(add_td_sources) + + function(add_header_files_for_glob hdrs_out glob) + file(GLOB hds ${glob}) +- set(${hdrs_out} ${hds} PARENT_SCOPE) ++ set(filtered) ++ foreach(file ${hds}) ++ # Explicit existence check is necessary to filter dangling symlinks ++ # out. See https://bugs.gentoo.org/674662. ++ if(EXISTS ${file}) ++ list(APPEND filtered ${file}) ++ endif() ++ endforeach() ++ set(${hdrs_out} ${filtered} PARENT_SCOPE) + endfunction(add_header_files_for_glob) + + function(find_all_header_files hdrs_out additional_headerdirs) +-- +2.21.0 + diff --git a/dev-lang/rust/files/1.30.1-clippy-sysroot.patch b/dev-lang/rust/files/1.30.1-clippy-sysroot.patch deleted file mode 100644 index d38f8ba5..00000000 --- a/dev-lang/rust/files/1.30.1-clippy-sysroot.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/src/tools/clippy/src/driver.rs 2018-10-25 20:09:06.143109996 +0300 -+++ b/src/tools/clippy/src/driver.rs 2018-10-25 20:11:09.204106005 +0300 -@@ -29,54 +29,22 @@ - exit(0); - } - -- let sys_root = option_env!("SYSROOT") -- .map(String::from) -- .or_else(|| std::env::var("SYSROOT").ok()) -- .or_else(|| { -- let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME")); -- let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN")); -- home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain))) -- }) -- .or_else(|| { -- Command::new("rustc") -- .arg("--print") -- .arg("sysroot") -- .output() -- .ok() -- .and_then(|out| String::from_utf8(out.stdout).ok()) -- .map(|s| s.trim().to_owned()) -- }) -- .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust"); -- - // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument. - // We're invoking the compiler programmatically, so we ignore this/ -- let mut orig_args: Vec<String> = env::args().collect(); -- if orig_args.len() <= 1 { -+ let mut args: Vec<String> = env::args().collect(); -+ if args.len() <= 1 { - std::process::exit(1); - } -- if Path::new(&orig_args[1]).file_stem() == Some("rustc".as_ref()) { -+ if Path::new(&args[1]).file_stem() == Some("rustc".as_ref()) { - // we still want to be able to invoke it normally though -- orig_args.remove(1); -+ args.remove(1); - } -- // this conditional check for the --sysroot flag is there so users can call -- // `clippy_driver` directly -- // without having to pass --sysroot or anything -- let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") { -- orig_args.clone() -- } else { -- orig_args -- .clone() -- .into_iter() -- .chain(Some("--sysroot".to_owned())) -- .chain(Some(sys_root)) -- .collect() -- }; - - // this check ensures that dependencies are built but not linted and the final - // crate is - // linted but not built - let clippy_enabled = env::var("CLIPPY_TESTS").ok().map_or(false, |val| val == "true") -- || orig_args.iter().any(|s| s == "--emit=dep-info,metadata"); -+ || args.iter().any(|s| s == "--emit=dep-info,metadata"); - - if clippy_enabled { - args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]); 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 new file mode 100644 index 00000000..52b8d6ea --- /dev/null +++ b/dev-lang/rust/files/1.34.0-doc-build-fix.patch @@ -0,0 +1,442 @@ +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 new file mode 100644 index 00000000..d5705f88 --- /dev/null +++ b/dev-lang/rust/files/1.34.0-libressl.patch @@ -0,0 +1,29 @@ +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/rust-1.31.1-r1337.ebuild b/dev-lang/rust/rust-1.34.2-r1337.ebuild index ef29b1c8..da018ddd 100644 --- a/dev-lang/rust/rust-1.31.1-r1337.ebuild +++ b/dev-lang/rust/rust-1.34.2-r1337.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) +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 @@ -14,13 +14,14 @@ if [[ ${PV} = *beta* ]]; then SLOT="beta/${PV}" SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" else - SLOT="stable/1.31" + ABI_VER="$(ver_cut 1-2)" + SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" KEYWORDS="~amd64" fi -RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1" +RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" DESCRIPTION="Systems programming language from Mozilla" HOMEPAGE="https://www.rust-lang.org/" @@ -29,23 +30,42 @@ 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})" ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ X86 XCore ) + NVPTX PowerPC Sparc SystemZ WebAssembly 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="clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. + +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 9. +# 3. Specify LLVM_MAX_SLOT, e.g. 8. +LLVM_DEPEND=" + || ( + sys-devel/llvm:8[llvm_targets_WebAssembly?] + ) + <sys-devel/llvm-9:= +" +LLVM_MAX_SLOT=8 COMMON_DEPEND=" - jemalloc? ( dev-libs/jemalloc ) - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libssh2 - net-libs/http-parser:= - net-misc/curl[ssl] - system-llvm? ( >=sys-devel/llvm-6:= )" + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-libs/http-parser:= + net-misc/curl[ssl] + system-llvm? ( + ${LLVM_DEPEND} + ) +" + DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} || ( @@ -57,11 +77,17 @@ RDEPEND="${COMMON_DEPEND} !dev-util/cargo rustfmt? ( !dev-util/rustfmt )" REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) - x86? ( cpu_flags_x86_sse2 )" + wasm? ( llvm_targets_WebAssembly ) + x86? ( cpu_flags_x86_sse2 ) +" -S="${WORKDIR}/${MY_P}-src" +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 +) -PATCHES=( "${FILESDIR}"/1.30.1-clippy-sysroot.patch ) +S="${WORKDIR}/${MY_P}-src" toml_usex() { usex "$1" true false @@ -69,11 +95,9 @@ toml_usex() { pre_build_checks() { CHECKREQS_DISK_BUILD="7G" - CHECKREQS_MEMORY="4G" eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then CHECKREQS_DISK_BUILD="10G" - CHECKREQS_MEMORY="16G" fi eshopts_pop check-reqs_pkg_setup @@ -86,9 +110,7 @@ pkg_pretend() { pkg_setup() { pre_build_checks python-any-r1_pkg_setup - if use system-llvm; then - llvm_pkg_setup - fi + use system-llvm && llvm_pkg_setup } src_prepare() { @@ -98,6 +120,12 @@ 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 } @@ -134,6 +162,7 @@ src_configure() { release-debuginfo = $(toml_usex debug) assertions = $(toml_usex debug) targets = "${LLVM_TARGETS// /;}" + experimental-targets = "" link-shared = $(toml_usex system-llvm) [build] build = "${rust_target}" @@ -157,7 +186,6 @@ src_configure() { optimize = $(toml_usex !debug) debuginfo = $(toml_usex debug) debug-assertions = $(toml_usex debug) - use-jemalloc = $(toml_usex jemalloc) default-linker = "$(tc-getCC)" channel = "stable" rpath = false @@ -181,7 +209,7 @@ src_configure() { EOF if use system-llvm; then cat <<- EOF >> "${S}"/config.toml - llvm-config = "$(get_llvm_prefix)/bin/llvm-config" + llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" EOF fi done @@ -196,14 +224,14 @@ src_configure() { src_compile() { env $(cat "${S}"/config.env)\ - "${EPYTHON}" ./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \ + "${EPYTHON}" ./x.py build -v --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 || die + env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || die # Copy shared library versions of standard libraries for all targets # into the system's abi-dependent lib directories because the rust @@ -214,9 +242,9 @@ src_install() { fi abi_libdir=$(get_abi_LIBDIR ${v##*.}) rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - mkdir -p "${D}/usr/${abi_libdir}" - cp "${D}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ - "${D}/usr/${abi_libdir}" || die + mkdir -p "${ED}/usr/${abi_libdir}" + cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ + "${ED}/usr/${abi_libdir}" || die done dodoc COPYRIGHT @@ -224,8 +252,35 @@ src_install() { # FIXME: # Really not sure if that env is needed, specailly LDPATH cat <<-EOF > "${T}"/50${P} - LDPATH="/usr/$(get_libdir)/${P}" - MANPATH="/usr/share/${P}/man" + LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}" + MANPATH="${EPREFIX}/usr/share/${P}/man" EOF doenvd "${T}"/50${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}." + + ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." + ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" + ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." + + 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 +} |