commit:     4ab70e87d0bf6ab8f2b9930842715999528d2d51
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 11:20:33 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 11:20:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab70e87

multilib-build.eclass: canonical `debug-print-function` calls

Closes: https://github.com/gentoo/gentoo/pull/26689
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 eclass/multilib-build.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 1ea31c0a79e8..40cc426a1359 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -140,7 +140,7 @@ unset -f _multilib_build_set_globals
 # If multilib is disabled, the default ABI will be returned
 # in order to enforce consistent testing with multilib code.
 multilib_get_enabled_abis() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        local pairs=( $(multilib_get_enabled_abi_pairs) )
        echo "${pairs[@]#*.}"
@@ -155,7 +155,7 @@ multilib_get_enabled_abis() {
 # If multilib is disabled, the default ABI will be returned
 # along with empty <use-flag>.
 multilib_get_enabled_abi_pairs() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        local abis=( $(get_all_abis) )
 
@@ -198,7 +198,7 @@ multilib_get_enabled_abi_pairs() {
 # @DESCRIPTION:
 # Initialize the environment for ABI selected for multibuild.
 _multilib_multibuild_wrapper() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        local ABI=${MULTIBUILD_VARIANT#*.}
        local -r MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*}
@@ -218,7 +218,7 @@ _multilib_multibuild_wrapper() {
 # If multilib support is disabled, it just runs the commands. No setup
 # is done.
 multilib_foreach_abi() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
        multibuild_foreach_variant _multilib_multibuild_wrapper "${@}"
@@ -237,7 +237,7 @@ multilib_foreach_abi() {
 # This function used to run multiple commands in parallel. Now it's just
 # a deprecated alias to multilib_foreach_abi.
 multilib_parallel_foreach_abi() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
        multibuild_foreach_variant _multilib_multibuild_wrapper "${@}"
@@ -295,7 +295,7 @@ multilib_check_headers() {
 # to ABI-specific build directory matching BUILD_DIR used by
 # multilib_foreach_abi().
 multilib_copy_sources() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) )
        multibuild_copy_sources
@@ -373,7 +373,7 @@ multilib_copy_sources() {
 # After all wrappers are prepared, multilib_install_wrappers shall
 # be called to commit them to the installation tree.
 multilib_prepare_wrappers() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
@@ -537,7 +537,7 @@ _EOF_
 # between the calls to multilib_prepare_wrappers
 # and multilib_install_wrappers.
 multilib_install_wrappers() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
@@ -558,7 +558,7 @@ multilib_install_wrappers() {
 # Determine whether the currently built ABI is the profile native.
 # Return true status (0) if that is true, otherwise false (1).
 multilib_is_native_abi() {
-       debug-print-function ${FUNCNAME} "${@}"
+       debug-print-function ${FUNCNAME} "$@"
 
        [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
 

Reply via email to