Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-dev] [PATCH] multilib.eclass: Avoid reserved variable names
Date: Sun, 15 May 2022 07:28:31
Message-Id: 20220515072814.14028-1-ulm@gentoo.org
1 Names that begin with __ are reserved for package manager use.
2
3 Closes: https://bugs.gentoo.org/843722
4 Signed-off-by: Ulrich Müller <ulm@g.o>
5 ---
6 eclass/multilib.eclass | 12 ++++++------
7 1 file changed, 6 insertions(+), 6 deletions(-)
8
9 diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
10 index ec2676cb6cfb..8590bbdfbff0 100644
11 --- a/eclass/multilib.eclass
12 +++ b/eclass/multilib.eclass
13 @@ -422,9 +422,9 @@ multilib_env() {
14
15 # the default abi is set to the 1-level libdir default
16
17 - local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
18 - local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
19 - export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib64}
20 + local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
21 + local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
22 + export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib64}
23
24 # all other abi are set to the 2-level libdir default
25
26 @@ -454,9 +454,9 @@ multilib_env() {
27
28 # the default abi is set to the 1-level libdir default
29
30 - local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
31 - local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable}
32 - export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib}
33 + local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}"
34 + local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable}
35 + export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib}
36
37 # all other abi are set to the 2-level libdir default
38
39 --
40 2.35.1

Replies