| 1 |
commit: 485461e3cfdd2f7a7cfcd74e2eb81b731a5c04f9 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 25 08:14:43 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 25 08:14:43 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485461e3 |
| 7 |
|
| 8 |
dev-lang/rust-bin: fix rustfmt/rls/analysis error |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/rust-bin/rust-bin-1.44.1.ebuild | 7 ++++--- |
| 14 |
dev-lang/rust-bin/rust-bin-1.45.2.ebuild | 7 ++++--- |
| 15 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/rust-bin/rust-bin-1.44.1.ebuild b/dev-lang/rust-bin/rust-bin-1.44.1.ebuild |
| 18 |
index 7165b90fd15..83070baf70e 100644 |
| 19 |
--- a/dev-lang/rust-bin/rust-bin-1.44.1.ebuild |
| 20 |
+++ b/dev-lang/rust-bin/rust-bin-1.44.1.ebuild |
| 21 |
@@ -45,13 +45,14 @@ multilib_src_install() { |
| 22 |
|
| 23 |
# start native abi install |
| 24 |
pushd "${S}" >/dev/null || die |
| 25 |
- local std |
| 26 |
+ local analysis std |
| 27 |
+ analysis="$(grep 'analysis' ./components)" |
| 28 |
std="$(grep 'std' ./components)" |
| 29 |
local components="rustc,cargo,${std}" |
| 30 |
use doc && components="${components},rust-docs" |
| 31 |
use clippy && components="${components},clippy-preview" |
| 32 |
- use rls && components="${components},rls-preview" |
| 33 |
- use rustfmt && components="${components},rustfmt-preview,rust-analysis" |
| 34 |
+ use rls && components="${components},rls-preview,${analysis}" |
| 35 |
+ use rustfmt && components="${components},rustfmt-preview" |
| 36 |
./install.sh \ |
| 37 |
--components="${components}" \ |
| 38 |
--disable-verify \ |
| 39 |
|
| 40 |
diff --git a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild |
| 41 |
index 3e4fa110440..6e586df2fca 100644 |
| 42 |
--- a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild |
| 43 |
+++ b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild |
| 44 |
@@ -45,13 +45,14 @@ multilib_src_install() { |
| 45 |
|
| 46 |
# start native abi install |
| 47 |
pushd "${S}" >/dev/null || die |
| 48 |
- local std |
| 49 |
+ local analysis std |
| 50 |
+ analysis="$(grep 'analysis' ./components)" |
| 51 |
std="$(grep 'std' ./components)" |
| 52 |
local components="rustc,cargo,${std}" |
| 53 |
use doc && components="${components},rust-docs" |
| 54 |
use clippy && components="${components},clippy-preview" |
| 55 |
- use rls && components="${components},rls-preview" |
| 56 |
- use rustfmt && components="${components},rustfmt-preview,rust-analysis" |
| 57 |
+ use rls && components="${components},rls-preview,${analysis}" |
| 58 |
+ use rustfmt && components="${components},rustfmt-preview" |
| 59 |
./install.sh \ |
| 60 |
--components="${components}" \ |
| 61 |
--disable-verify \ |
Archives