Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rustup/
Date: Sat, 01 May 2021 12:22:33
Message-Id: 1619871679.b88ecf49381e3cae77f113ddd54a3eadae2fd473.gyakovlev@gentoo
1 commit: b88ecf49381e3cae77f113ddd54a3eadae2fd473
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 1 12:11:57 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 12:21:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88ecf49
7
8 dev-util/rustup: update live ebuild
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 dev-util/rustup/rustup-9999.ebuild | 20 ++++++++++++++++----
14 1 file changed, 16 insertions(+), 4 deletions(-)
15
16 diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
17 index ccdc91c9c6b..36bc896f0bc 100644
18 --- a/dev-util/rustup/rustup-9999.ebuild
19 +++ b/dev-util/rustup/rustup-9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 2020 Gentoo Authors
22 +# Copyright 2020-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -24,7 +24,6 @@ LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Un
27 SLOT="0"
28 IUSE=""
29
30 -# requires old libressl-2.5, so openssl only for now.
31 DEPEND="
32 app-arch/xz-utils
33 net-misc/curl:=[http2,ssl]
34 @@ -48,8 +47,21 @@ src_unpack() {
35 }
36
37 src_configure() {
38 - local myfeatures=( no-self-update )
39 - cargo_src_configure
40 + # modeled after ci/run.bash upstream
41 + # reqwest-rustls-tls requires ring crate, which is not very portable.
42 + local myfeatures=(
43 + no-self-update
44 + curl-backend
45 + reqwest-backend
46 + reqwest-default-tls
47 + )
48 + case ${ARCH} in
49 + ppc*|mips*|riscv*|s390*)
50 + ;;
51 + *) myfeatures+=( reqwest-rustls-tls )
52 + ;;
53 + esac
54 + cargo_src_configure --no-default-features
55 }
56
57 src_compile() {