Mailing List Archive

[PATCH] multilib.eclass: Avoid reserved variable names
Names that begin with __ are reserved for package manager use.

Closes: https://bugs.gentoo.org/843722
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/multilib.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index ec2676cb6cfb..8590bbdfbff0 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -422,9 +422,9 @@ multilib_env() {

# the default abi is set to the 1-level libdir default

- local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
- local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
- export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib64}
+ local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
+ local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
+ export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib64}

# all other abi are set to the 2-level libdir default

@@ -454,9 +454,9 @@ multilib_env() {

# the default abi is set to the 1-level libdir default

- local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
- local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
- export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib}
+ local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
+ local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
+ export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib}

# all other abi are set to the 2-level libdir default

--
2.35.1
Re: [PATCH] multilib.eclass: Avoid reserved variable names [ In reply to ]
On Sun, 2022-05-15 at 09:28 +0200, Ulrich Müller wrote:
> Names that begin with __ are reserved for package manager use.
>
> Closes: https://bugs.gentoo.org/843722
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
>  eclass/multilib.eclass | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
> index ec2676cb6cfb..8590bbdfbff0 100644
> --- a/eclass/multilib.eclass
> +++ b/eclass/multilib.eclass
> @@ -422,9 +422,9 @@ multilib_env() {
>  
>                         # the default abi is set to the 1-level libdir
> default
>  
> -                       local
> __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
> -                       local
> __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
> -                       export
> ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-
> lib64}
> +                       local
> _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
> +                       local
> _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
> +                       export
> ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib64}
>  
>                         # all other abi are set to the 2-level libdir
> default
>  
> @@ -454,9 +454,9 @@ multilib_env() {
>  
>                         # the default abi is set to the 1-level libdir
> default
>  
> -                       local
> __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
> -                       local
> __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
> -                       export
> ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib}
> +                       local
> _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
> +                       local
> _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
> +                       export
> ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib}
>  
>                         # all other abi are set to the 2-level libdir
> default
>  

LGTM