1 |
commit: f8e6b812abca6132a0d4d2bee404aee87665ee9d |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 6 15:12:45 2015 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 9 20:41:16 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e6b812 |
7 |
|
8 |
multilib-build.eclass: Mark eclass-generated variables read-only |
9 |
|
10 |
eclass/multilib-build.eclass | 7 ++++--- |
11 |
1 file changed, 4 insertions(+), 3 deletions(-) |
12 |
|
13 |
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass |
14 |
index ca0fd54..dd03553 100644 |
15 |
--- a/eclass/multilib-build.eclass |
16 |
+++ b/eclass/multilib-build.eclass |
17 |
@@ -37,7 +37,7 @@ inherit multibuild multilib |
18 |
# Please contact multilib before modifying this list. This way we can |
19 |
# ensure that every *preliminary* work is done and the multilib can be |
20 |
# extended safely. |
21 |
-_MULTILIB_FLAGS=( |
22 |
+declare -g -r _MULTILIB_FLAGS=( |
23 |
abi_x86_32:x86,x86_fbsd,x86_freebsd,x86_linux,x86_macos,x86_solaris |
24 |
abi_x86_64:amd64,amd64_fbsd,x64_freebsd,amd64_linux,x64_macos,x64_solaris |
25 |
abi_x86_x32:x32 |
26 |
@@ -123,7 +123,7 @@ _multilib_build_set_globals() { |
27 |
local usedeps=${flags[@]/%/(-)?} |
28 |
|
29 |
IUSE=${flags[*]} |
30 |
- MULTILIB_USEDEP=${usedeps// /,} |
31 |
+ declare -g -r MULTILIB_USEDEP=${usedeps// /,} |
32 |
} |
33 |
_multilib_build_set_globals |
34 |
|
35 |
@@ -196,9 +196,10 @@ _multilib_multibuild_wrapper() { |
36 |
debug-print-function ${FUNCNAME} "${@}" |
37 |
|
38 |
local ABI=${MULTIBUILD_VARIANT#*.} |
39 |
- local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*} |
40 |
+ local -r MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*} |
41 |
|
42 |
multilib_toolchain_setup "${ABI}" |
43 |
+ readonly ABI |
44 |
"${@}" |
45 |
} |