1 |
commit: 5ee3f1d73f1af4b039afb3549d5a18df327e5016 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 30 18:34:09 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 30 22:22:24 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee3f1d7 |
7 |
|
8 |
dev-lang/rust: fix wasm deps |
9 |
|
10 |
skip revbumps, because wasm is not widely used, |
11 |
so users without wasm are not forced to rebuild. |
12 |
|
13 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
15 |
|
16 |
dev-lang/rust/rust-1.41.1.ebuild | 2 +- |
17 |
dev-lang/rust/rust-1.42.0.ebuild | 5 ++--- |
18 |
2 files changed, 3 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/dev-lang/rust/rust-1.41.1.ebuild b/dev-lang/rust/rust-1.41.1.ebuild |
21 |
index bcd7281b8c8..2f815fa79c8 100644 |
22 |
--- a/dev-lang/rust/rust-1.41.1.ebuild |
23 |
+++ b/dev-lang/rust/rust-1.41.1.ebuild |
24 |
@@ -51,9 +51,9 @@ IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls |
25 |
LLVM_DEPEND=" |
26 |
|| ( |
27 |
sys-devel/llvm:9[llvm_targets_WebAssembly?] |
28 |
- wasm? ( =sys-devel/lld-9* ) |
29 |
) |
30 |
<sys-devel/llvm-10:= |
31 |
+ wasm? ( sys-devel/lld ) |
32 |
" |
33 |
LLVM_MAX_SLOT=9 |
34 |
|
35 |
|
36 |
diff --git a/dev-lang/rust/rust-1.42.0.ebuild b/dev-lang/rust/rust-1.42.0.ebuild |
37 |
index 196b58683e6..1b72b56f8df 100644 |
38 |
--- a/dev-lang/rust/rust-1.42.0.ebuild |
39 |
+++ b/dev-lang/rust/rust-1.42.0.ebuild |
40 |
@@ -52,13 +52,13 @@ LLVM_DEPEND=" |
41 |
|| ( |
42 |
sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}] |
43 |
sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}] |
44 |
- wasm? ( >=sys-devel/lld-9 ) |
45 |
) |
46 |
<sys-devel/llvm-11:= |
47 |
+ wasm? ( sys-devel/lld ) |
48 |
" |
49 |
LLVM_MAX_SLOT=10 |
50 |
|
51 |
-BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )" |
52 |
+BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )" |
53 |
|
54 |
COMMON_DEPEND=" |
55 |
net-libs/libssh2:= |
56 |
@@ -267,7 +267,6 @@ src_configure() { |
57 |
EOF |
58 |
fi |
59 |
done |
60 |
- |
61 |
if use wasm; then |
62 |
cat <<- EOF >> "${S}"/config.toml |
63 |
[target.wasm32-unknown-unknown] |