diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2024-06-12 17:59:23 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2024-06-12 18:13:21 +0100 |
| commit | 82ae7b64442ed6fb9ea99e6d64af1eb173a54adb (patch) | |
| tree | e3cab0d8010058b3182cc1171a688f2ecee3fb95 /eclass | |
| parent | sys-apps/systemd-utils: install /bin/udevadm symlink on split-usr (diff) | |
| download | gentoo-82ae7b64442ed6fb9ea99e6d64af1eb173a54adb.tar.gz gentoo-82ae7b64442ed6fb9ea99e6d64af1eb173a54adb.tar.bz2 gentoo-82ae7b64442ed6fb9ea99e6d64af1eb173a54adb.zip | |
rust-toolchain.eclass: Drop unused rust_all_abis() and multilib inherit
multilib USE flags have unintentionally appeared against all Cargo
packages since this eclass was used by cargo.eclass. The rust_all_abis()
function is not used anywhere though, and removing it makes the
multilib-build inherit that is causing the issue redundant.
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/rust-toolchain.eclass | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 5484d150614f..111aece796ce 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -7,17 +7,14 @@ # @SUPPORTED_EAPIS: 8 # @BLURB: helps map gentoo arches to rust ABIs # @DESCRIPTION: -# This eclass contains a src_unpack default phase function, and -# helper functions, to aid in proper rust-ABI handling for various -# gentoo arches. +# This eclass contains helper functions, to aid in proper rust-ABI handling for +# various gentoo arches. case ${EAPI} in 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -inherit multilib-build - # @ECLASS_VARIABLE: RUST_TOOLCHAIN_BASEURL # @DESCRIPTION: # This variable specifies the base URL used by the @@ -57,24 +54,6 @@ rust_abi() { esac } -# @FUNCTION: rust_all_abis -# @DESCRIPTION: -# Outputs a list of all the enabled Rust ABIs -rust_all_abis() { - if use multilib; then - local abi - local ALL_ABIS=() - for abi in $(multilib_get_enabled_abis); do - ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) ) - done - local abi_list - IFS=, eval 'abi_list=${ALL_ABIS[*]}' - echo ${abi_list} - else - rust_abi - fi -} - # @FUNCTION: rust_arch_uri # @USAGE: <rust-ABI> <base-uri> [alt-distfile-basename] # @DESCRIPTION: |