diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.46.0-don-t-create-prefix-at-time-of-check.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.46.0-don-t-create-prefix-at-time-of-check.patch deleted file mode 100644 index 9064a52ac2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.46.0-don-t-create-prefix-at-time-of-check.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6b31232a9d32529e30765108f30365ac48587ce6 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -Date: Thu, 8 Oct 2020 15:48:33 -0700 -Subject: [PATCH] don't create prefix at time of check - ---- - src/bootstrap/install.rs | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs -index d9ee3bc..c5da9ce 100644 ---- a/src/bootstrap/install.rs -+++ b/src/bootstrap/install.rs -@@ -73,12 +73,8 @@ fn install_sh( - let docdir_default = datadir_default.join("doc/rust"); - let libdir_default = PathBuf::from("lib"); - let mandir_default = datadir_default.join("man"); -- let prefix = builder.config.prefix.as_ref().map_or(prefix_default, |p| { -- fs::create_dir_all(p) -- .unwrap_or_else(|err| panic!("could not create {}: {}", p.display(), err)); -- fs::canonicalize(p) -- .unwrap_or_else(|err| panic!("could not canonicalize {}: {}", p.display(), err)) -- }); -+ -+ let prefix = builder.config.prefix.as_ref().unwrap_or(&prefix_default); - let sysconfdir = builder.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default); - let datadir = builder.config.datadir.as_ref().unwrap_or(&datadir_default); - let docdir = builder.config.docdir.as_ref().unwrap_or(&docdir_default); --- -2.28.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.50.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.50.0.ebuild index 8e08dc8503..efc822b63f 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.50.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.50.0.ebuild @@ -101,6 +101,7 @@ REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) QA_FLAGS_IGNORED=" usr/bin/.*-${PV} + usr/libexec/.*-${PV} usr/lib.*/lib.*.so usr/lib/rustlib/.*/codegen-backends/librustc_codegen_llvm-llvm.so usr/lib/rustlib/.*/lib/lib.*.so @@ -117,7 +118,6 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/1.47.0-libressl.patch - "${FILESDIR}"/1.46.0-don-t-create-prefix-at-time-of-check.patch "${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.47.0-llvm-tensorflow-fix.patch "${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch @@ -439,7 +439,7 @@ src_install() { # bug #689562, #689160 rm "${D}/etc/bash_completion.d/cargo" || die rmdir "${D}"/etc{/bash_completion.d,} || die - dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo + newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die