| 1 |
commit: a7be80ffab84db91e93f4d27021a63bbec490a9f |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 15 07:26:39 2022 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 17 03:02:52 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7be80ff |
| 7 |
|
| 8 |
multilib.eclass: Avoid reserved variable names |
| 9 |
|
| 10 |
Names that begin with __ are reserved for package manager use. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/843722 |
| 13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/multilib.eclass | 12 ++++++------ |
| 16 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass |
| 19 |
index ec2676cb6cfb..8590bbdfbff0 100644 |
| 20 |
--- a/eclass/multilib.eclass |
| 21 |
+++ b/eclass/multilib.eclass |
| 22 |
@@ -422,9 +422,9 @@ multilib_env() { |
| 23 |
|
| 24 |
# the default abi is set to the 1-level libdir default |
| 25 |
|
| 26 |
- local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}" |
| 27 |
- local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable} |
| 28 |
- export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib64} |
| 29 |
+ local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}" |
| 30 |
+ local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable} |
| 31 |
+ export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib64} |
| 32 |
|
| 33 |
# all other abi are set to the 2-level libdir default |
| 34 |
|
| 35 |
@@ -454,9 +454,9 @@ multilib_env() { |
| 36 |
|
| 37 |
# the default abi is set to the 1-level libdir default |
| 38 |
|
| 39 |
- local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}" |
| 40 |
- local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable} |
| 41 |
- export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib} |
| 42 |
+ local _libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}" |
| 43 |
+ local _libdir_riscvdefaultabi=${!_libdir_riscvdefaultabi_variable} |
| 44 |
+ export ${_libdir_riscvdefaultabi_variable}=${_libdir_riscvdefaultabi:-lib} |
| 45 |
|
| 46 |
# all other abi are set to the 2-level libdir default |
Archives