commit:     a7be80ffab84db91e93f4d27021a63bbec490a9f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 07:26:39 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 17 03:02:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7be80ff

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 <AT> 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
 

Reply via email to