Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 19 Jan 2020 06:38:34
Message-Id: 1579415862.3f038cafa40b22fc2210000d2418b86e415cb1a7.gyakovlev@gentoo
1 commit: 3f038cafa40b22fc2210000d2418b86e415cb1a7
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 19 06:22:27 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 19 06:37:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f038caf
7
8 rust-toolchain.eclass: fix whitespace
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 eclass/rust-toolchain.eclass | 70 ++++++++++++++++++++++----------------------
13 1 file changed, 35 insertions(+), 35 deletions(-)
14
15 diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
16 index 6a559842f07..304ee905245 100644
17 --- a/eclass/rust-toolchain.eclass
18 +++ b/eclass/rust-toolchain.eclass
19 @@ -33,22 +33,22 @@ inherit multilib-build
20 # environment if none is specified.
21
22 rust_abi() {
23 - local CTARGET=${1:-${CHOST}}
24 - case ${CTARGET%%*-} in
25 - aarch64*) echo aarch64-unknown-linux-gnu;;
26 - mips64*) echo mips64-unknown-linux-gnuabi64;;
27 - powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
28 - powerpc64*) echo powerpc64-unknown-linux-gnu;;
29 - x86_64*) echo x86_64-unknown-linux-gnu;;
30 - armv6j*s*) echo arm-unknown-linux-gnueabi;;
31 - armv6j*h*) echo arm-unknown-linux-gnueabihf;;
32 - armv7a*h*) echo armv7-unknown-linux-gnueabihf;;
33 - i?86*) echo i686-unknown-linux-gnu;;
34 - mipsel*) echo mipsel-unknown-linux-gnu;;
35 - mips*) echo mips-unknown-linux-gnu;;
36 - powerpc*) echo powerpc-unknown-linux-gnu;;
37 - s390x*) echo s390x-unknown-linux-gnu;;
38 - *) echo ${CTARGET};;
39 + local CTARGET=${1:-${CHOST}}
40 + case ${CTARGET%%*-} in
41 + aarch64*) echo aarch64-unknown-linux-gnu;;
42 + mips64*) echo mips64-unknown-linux-gnuabi64;;
43 + powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
44 + powerpc64*) echo powerpc64-unknown-linux-gnu;;
45 + x86_64*) echo x86_64-unknown-linux-gnu;;
46 + armv6j*s*) echo arm-unknown-linux-gnueabi;;
47 + armv6j*h*) echo arm-unknown-linux-gnueabihf;;
48 + armv7a*h*) echo armv7-unknown-linux-gnueabihf;;
49 + i?86*) echo i686-unknown-linux-gnu;;
50 + mipsel*) echo mipsel-unknown-linux-gnu;;
51 + mips*) echo mips-unknown-linux-gnu;;
52 + powerpc*) echo powerpc-unknown-linux-gnu;;
53 + s390x*) echo s390x-unknown-linux-gnu;;
54 + *) echo ${CTARGET};;
55 esac
56 }
57
58 @@ -56,18 +56,18 @@ rust_abi() {
59 # @DESCRIPTION:
60 # Outputs a list of all the enabled Rust ABIs
61 rust_all_abis() {
62 - if use multilib; then
63 - local abi
64 - local ALL_ABIS=()
65 - for abi in $(multilib_get_enabled_abis); do
66 - ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) )
67 - done
68 - local abi_list
69 - IFS=, eval 'abi_list=${ALL_ABIS[*]}'
70 - echo ${abi_list}
71 - else
72 - rust_abi
73 - fi
74 + if use multilib; then
75 + local abi
76 + local ALL_ABIS=()
77 + for abi in $(multilib_get_enabled_abis); do
78 + ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) )
79 + done
80 + local abi_list
81 + IFS=, eval 'abi_list=${ALL_ABIS[*]}'
82 + echo ${abi_list}
83 + else
84 + rust_abi
85 + fi
86 }
87
88 # @FUNCTION: rust_arch_uri
89 @@ -79,22 +79,22 @@ rust_all_abis() {
90 #
91 # @EXAMPLE:
92 # SRC_URI="amd64? (
93 -# $(rust_arch_uri x86_64-unknown-linux-gnu rustc-${STAGE0_VERSION})
94 +# $(rust_arch_uri x86_64-unknown-linux-gnu rustc-${STAGE0_VERSION})
95 # )"
96 #
97 rust_arch_uri() {
98 - if [ -n "$3" ]; then
99 - echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> ${3}-${1}.tar.xz"
100 - else
101 - echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz"
102 - fi
103 + if [ -n "$3" ]; then
104 + echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> ${3}-${1}.tar.xz"
105 + else
106 + echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz"
107 + fi
108 }
109
110 # @FUNCTION: rust_all_arch_uris
111 # @USAGE: <base-uri> [alt-distfile-basename]
112 # @DESCRIPTION:
113 # Outputs the URIs for SRC_URI to help fetch dependencies, using a base URI
114 -# provided as an argument. Optionally allows for distfile renaming via a specified
115 +# provided as an argument. Optionally allows for distfile renaming via a specified
116 # basename.
117 #
118 # @EXAMPLE: