summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2022-05-15 09:26:39 +0200
committerUlrich Müller <ulm@gentoo.org>2022-05-17 05:02:52 +0200
commita7be80ffab84db91e93f4d27021a63bbec490a9f (patch)
tree8a8994a98b07e9dc0c2081d011ca7a8a4f172c4b
parentgnome-base/gvfs: Subscribe to libnfs subslot (diff)
downloadgentoo-a7be80ffab84db91e93f4d27021a63bbec490a9f.tar.gz
gentoo-a7be80ffab84db91e93f4d27021a63bbec490a9f.tar.bz2
gentoo-a7be80ffab84db91e93f4d27021a63bbec490a9f.zip
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>
-rw-r--r--eclass/multilib.eclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index ec2676cb6cf..8590bbdfbff 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