From a7be80ffab84db91e93f4d27021a63bbec490a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 15 May 2022 09:26:39 +0200 Subject: [PATCH] multilib.eclass: Avoid reserved variable names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Names that begin with __ are reserved for package manager use. Closes: https://bugs.gentoo.org/843722 Signed-off-by: Ulrich Müller --- eclass/multilib.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index ec2676cb6cfb2..8590bbdfbff0e 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