diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-09-16 12:11:35 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-16 12:11:35 +0100 |
commit | b66ecfb4dc09ba76e37787df2f7df1a78c3c1cc9 (patch) | |
tree | 884bce771a1bba8b311dfffbde4acdad07bf2c54 /dev-lang/rust | |
parent | 08e318096831eb3aae369910ba75e27f59367e2f (diff) |
gentoo auto-resync : 16:09:2024 - 12:11:35
Diffstat (limited to 'dev-lang/rust')
-rw-r--r-- | dev-lang/rust/Manifest | 2 | ||||
-rw-r--r-- | dev-lang/rust/files/1.71.0-fix-bashcomp-installation.patch | 23 | ||||
-rw-r--r-- | dev-lang/rust/files/1.71.0-lint-docs-libpath.patch | 39 |
3 files changed, 0 insertions, 64 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index d469429aee37..74a1b406bd11 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -1,8 +1,6 @@ AUX 1.62.1-musl-dynamic-linking.patch 898 BLAKE2B 09321e356d5c945f72e75e668bfee2a78158131713b917d7a70834dfb0e9c732a1d259ac5406e12552ffa5741dd03c08a5a04e3c68d3e6f905318486b23f081e SHA512 3edefd746a2b1eacaef7b3fd51b14a36ec0a5a4f8893355c48d3afba862405451f4d6961b22b429db1b402572d841d91351ac4759ab8ef3891fd00641d827d48 AUX 1.67.0-doc-wasm.patch 1359 BLAKE2B 59293c5b61de7ca283629d7f65b965388a42527811fc8355cdf5320fee03d10560f34e9c9a25dbe91e5758c37484485581a5e524a497711f1e108e5ffde6c53c SHA512 f3bafc2d0d2569f0d6891e14aa307cd2425d6624832b27381ae9d6f7ced488eff6d5fa0cdcd77a98d1f92a10a9d832f3aa3c481d1abbb42a0882862bbb189346 AUX 1.70.0-ignore-broken-and-non-applicable-tests.patch 1029 BLAKE2B 42a634c423c57f23bf709294f79024fde03a529c9de6e15554102bfb0a777571e388a8a122d8e01fa8b1889b873083e7802ee30bc9de3c3ebd758a6c7628f295 SHA512 3b0f22370f002934f5237849f2a018989a700e6b4ed5ffe308d5a0acda54c85b67919db88a94eb991568056030899802ceb2bf102ce8eef9745efee40e8f738c -AUX 1.71.0-fix-bashcomp-installation.patch 968 BLAKE2B 381ef44295257d6131b4ef98036697d90a091bf2b3ea4333301a63a2a9e9d63bb6e2f711332ab8e47a2b362f1157e318dad4a8307665867484f8a5f67af79b7d SHA512 6e1c0a102311e35ecf9ffd3769c8d96a7c24a9772219d68f02afd57834c5bdf830155f515dcdb098bc2d1a6d2aaa0c5b9955282716b3340cdde61bc4b438ab13 -AUX 1.71.0-lint-docs-libpath.patch 1992 BLAKE2B 9b8edcbe8dd8f87861901115511316d770c46c731da2bca6e8f9b62eec25d21303c96ae1665e4cfe04f3cf5e9b9a7ed7123275ee3c0b5cd2dad56c67d660bd5b SHA512 3ecb2ab25de94191ed5de059dc7f3be1efcfab9b0306042f39f3dd98cb7a2561480114f80e9f65ea13753491af19dc95054d31aaece90faa67752f3dbe957edb AUX 1.71.1-fix-bootstrap-version-comparison.patch 1282 BLAKE2B 9be35fddbb7a9d35c208be5de7fbb1c06fa6439b1ddf3270ec0afa5f6efae9e098fa424d5a3b5bf7e9804845de7040feffcd992ad53183abb00e41148a36359b SHA512 41aadf359d97ff215397659b49d5effcfba07a5bdd3d56c47765aaa4a79eebf86af9a3ea6f3a7dc55cfb710d5526cca3b7cc539c9101a0ad9badaed08f7d14fd AUX 1.72.0-bump-libc-deps-to-0.2.146.patch 5106 BLAKE2B aa3a9921c16d8ef4010d930a32be82da25133a2b42b65bda082e46ddf5cfb0e596a74c556c69f56b18bf0559faa2632685a0b8a0a2fd89a0671c1f3912964c93 SHA512 130134c2c022bba3bdde94943ca927a84f4797eb0c7854fc497a3fa8575bb8f47d488f07e2d984ee18ece0f08968ea94ed59a0e57c8157b85654f0e267e1f68a AUX 1.74.1-cross-compile-libz.patch 720 BLAKE2B 60f7e0ed095546f6f1b0566bc97d6d550f129000565dd6414a0bdd58b5b9c35f390784f71f02444132f2a507b25f874dcb8f5a684e003083bd6e8f274426859a SHA512 fccbf1772d62b1217625b576828051be7cadb03c96ccc753abd15a51979c807b7b464220973bdc765ede3adf7469fafe1db88228a70e937a623240d36e99e122 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 <ekusiadadus@gmail.com> -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 <github@jyn.dev> -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 { |