summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-03-30 11:34:09 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-03-30 15:22:24 -0700
commit5ee3f1d73f1af4b039afb3549d5a18df327e5016 (patch)
tree47a46f93b465891eddedba8bb10e2b03313cd8b1 /dev-lang
parentdev-python/cherrypy: Fix sed to remove pytest-cov (diff)
downloadgentoo-5ee3f1d73f1af4b039afb3549d5a18df327e5016.tar.gz
gentoo-5ee3f1d73f1af4b039afb3549d5a18df327e5016.tar.bz2
gentoo-5ee3f1d73f1af4b039afb3549d5a18df327e5016.zip
dev-lang/rust: fix wasm deps
skip revbumps, because wasm is not widely used, so users without wasm are not forced to rebuild. Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/rust/rust-1.41.1.ebuild2
-rw-r--r--dev-lang/rust/rust-1.42.0.ebuild5
2 files changed, 3 insertions, 4 deletions
diff --git a/dev-lang/rust/rust-1.41.1.ebuild b/dev-lang/rust/rust-1.41.1.ebuild
index bcd7281b8c81..2f815fa79c82 100644
--- a/dev-lang/rust/rust-1.41.1.ebuild
+++ b/dev-lang/rust/rust-1.41.1.ebuild
@@ -51,9 +51,9 @@ IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls
LLVM_DEPEND="
|| (
sys-devel/llvm:9[llvm_targets_WebAssembly?]
- wasm? ( =sys-devel/lld-9* )
)
<sys-devel/llvm-10:=
+ wasm? ( sys-devel/lld )
"
LLVM_MAX_SLOT=9
diff --git a/dev-lang/rust/rust-1.42.0.ebuild b/dev-lang/rust/rust-1.42.0.ebuild
index 196b58683e69..1b72b56f8df4 100644
--- a/dev-lang/rust/rust-1.42.0.ebuild
+++ b/dev-lang/rust/rust-1.42.0.ebuild
@@ -52,13 +52,13 @@ LLVM_DEPEND="
|| (
sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
- wasm? ( >=sys-devel/lld-9 )
)
<sys-devel/llvm-11:=
+ wasm? ( sys-devel/lld )
"
LLVM_MAX_SLOT=10
-BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
+BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
COMMON_DEPEND="
net-libs/libssh2:=
@@ -267,7 +267,6 @@ src_configure() {
EOF
fi
done
-
if use wasm; then
cat <<- EOF >> "${S}"/config.toml
[target.wasm32-unknown-unknown]