diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37812 -> 37817 bytes | |||
| -rw-r--r-- | eclass/ruby-fakegem.eclass | 4 | ||||
| -rw-r--r-- | eclass/ruby-single.eclass | 4 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex fe77149b4e52..c8a0ab6dca7d 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 77d2163e06fd..db3db300c023 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -400,10 +400,10 @@ ruby_fakegem_binwrapper() { # in the shebang, and we can actually avoid errors when # calling the script by default. local rubycmd= - for implementation in $(_ruby_get_all_impls); do + for implementation in "${_RUBY_GET_ALL_IMPLS[@]}"; do # ignore non-enabled implementations use ruby_targets_${implementation} || continue - if [ -z $rubycmd ]; then + if [[ -z ${rubycmd} ]]; then # if no other implementation was set before, set it. rubycmd="$(ruby_implementation_command ${implementation})" else diff --git a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass index 5f6cf9e46dce..effdbd3e96a0 100644 --- a/eclass/ruby-single.eclass +++ b/eclass/ruby-single.eclass @@ -69,11 +69,11 @@ inherit ruby-utils # current state of ruby targets, e.g. stable version first. _ruby_single_implementations_depend() { - local depend + local _ruby_implementation depend for _ruby_implementation in ${RUBY_TARGETS_PREFERENCE}; do if [[ ${USE_RUBY} =~ ${_ruby_implementation} ]]; then depend+=" (" - depend+=" $(_ruby_implementation_depend $_ruby_implementation)" + depend+=" $(_ruby_implementation_depend ${_ruby_implementation})" depend+=" virtual/rubygems[ruby_targets_${_ruby_implementation}(-)]" depend+=" )" fi diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 3578ac7f44ec..3013e5c9aeca 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -22,7 +22,6 @@ _TOOLCHAIN_ECLASS=1 DESCRIPTION="The GNU Compiler Collection" HOMEPAGE="https://gcc.gnu.org/" -[[ ${EAPI} == 7 ]] && inherit eutils inherit edo flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix tc_is_live() { @@ -61,7 +60,6 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } - # @FUNCTION: tc_version_is_at_least # @USAGE: ver1 [ver2] # @DESCRIPTION: @@ -927,7 +925,6 @@ toolchain_src_configure() { # ;; # esac - ### Cross-compiler options if is_crosscompile ; then # Enable build warnings by default with cross-compilers when system |