commit: f7ddccda3c28c983ada70e1b2a509df2f1d90e82 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Sep 11 18:07:19 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Sep 15 13:51:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ddccda
dev-lang/rust: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/38570 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/1.71.0-fix-bashcomp-installation.patch | 23 ------------- dev-lang/rust/files/1.71.0-lint-docs-libpath.patch | 39 ---------------------- 2 files changed, 62 deletions(-) diff --git a/dev-lang/rust/files/1.71.0-fix-bashcomp-installation.patch b/dev-lang/rust/files/1.71.0-fix-bashcomp-installation.patch deleted file mode 100644 index 14efbfc63f8c..000000000000 --- a/dev-lang/rust/files/1.71.0-fix-bashcomp-installation.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/rust-lang/rust/pull/113579 which reverts the broken -https://github.com/rust-lang/rust/pull/110906. -From: ekusiadadus <[email protected]> -Date: Wed, 12 Jul 2023 00:54:27 +0900 -Subject: [PATCH] Revert "fix: :bug: etc/bash_complettion -> src/etc/... to - avoid copy error" - -This reverts commit 08ce68b6a6bad360e9c3611ad60cf6598401f878. ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -1074,11 +1074,7 @@ impl Step for Cargo { - - tarball.add_file(&cargo, "bin", 0o755); - tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); -- tarball.add_renamed_file( -- etc.join("cargo.bashcomp.sh"), -- "src/etc/bash_completion.d", -- "cargo", -- ); -+ tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo"); - tarball.add_dir(etc.join("man"), "share/man/man1"); - tarball.add_legal_and_readme_to("share/doc/cargo"); - diff --git a/dev-lang/rust/files/1.71.0-lint-docs-libpath.patch b/dev-lang/rust/files/1.71.0-lint-docs-libpath.patch deleted file mode 100644 index 27c673835c7b..000000000000 --- a/dev-lang/rust/files/1.71.0-lint-docs-libpath.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/910595 -https://github.com/rust-lang/rust/issues/113678 - -https://github.com/rust-lang/rust/commit/67b5990472e3cac643d8cf90f45fe42201ddec3c -From: jyn <[email protected]> -Date: Mon, 10 Jul 2023 15:59:30 -0500 -Subject: [PATCH] Revert "Fix `x test lint-docs` when download-rustc is - enabled" - -This was not the correct fix. The problem was two-fold: -- `download-rustc` didn't respect `llvm.assertions` -- `rust-dev` was missing a bump to `download-ci-llvm-stamp` - -The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`. ---- a/src/tools/lint-docs/src/groups.rs -+++ b/src/tools/lint-docs/src/groups.rs -@@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> { - fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> { - let mut result = BTreeMap::new(); - let mut cmd = Command::new(self.rustc_path); -- cmd.env_remove("LD_LIBRARY_PATH"); - cmd.arg("-Whelp"); - let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?; - if !output.status.success() { ---- a/src/tools/lint-docs/src/lib.rs -+++ b/src/tools/lint-docs/src/lib.rs -@@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> { - fs::write(&tempfile, source) - .map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?; - let mut cmd = Command::new(self.rustc_path); -- // NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself. -- // Unfortunately, lint-docs is a bootstrap tool while rustc is built from source, -- // and sometimes the paths conflict. In particular, when using `download-rustc`, -- // the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`. -- // Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler. -- cmd.env_remove("LD_LIBRARY_PATH"); - if options.contains(&"edition2015") { - cmd.arg("--edition=2015"); - } else {
