| 1 |
commit: e4c940086141d6a45daefb705c261f170f178bde |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 11 21:25:17 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 11 21:27:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c94008 |
| 7 |
|
| 8 |
multilib-build.eclass: Replace non-portable use of 'declare -g' |
| 9 |
|
| 10 |
Replace uses of 'declare -g -r' (bash-4.2+) with 'readonly'. Reported |
| 11 |
by Arfrever. |
| 12 |
|
| 13 |
eclass/multilib-build.eclass | 4 ++-- |
| 14 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass |
| 17 |
index 0d4ffd9..91885a4 100644 |
| 18 |
--- a/eclass/multilib-build.eclass |
| 19 |
+++ b/eclass/multilib-build.eclass |
| 20 |
@@ -38,7 +38,7 @@ inherit multibuild multilib |
| 21 |
# Please contact multilib before modifying this list. This way we can |
| 22 |
# ensure that every *preliminary* work is done and the multilib can be |
| 23 |
# extended safely. |
| 24 |
-declare -g -r _MULTILIB_FLAGS=( |
| 25 |
+readonly _MULTILIB_FLAGS=( |
| 26 |
abi_x86_32:x86,x86_fbsd,x86_freebsd,x86_linux,x86_macos,x86_solaris |
| 27 |
abi_x86_64:amd64,amd64_fbsd,x64_freebsd,amd64_linux,x64_macos,x64_solaris |
| 28 |
abi_x86_x32:x32 |
| 29 |
@@ -124,7 +124,7 @@ _multilib_build_set_globals() { |
| 30 |
local usedeps=${flags[@]/%/(-)?} |
| 31 |
|
| 32 |
IUSE=${flags[*]} |
| 33 |
- declare -g -r MULTILIB_USEDEP=${usedeps// /,} |
| 34 |
+ readonly MULTILIB_USEDEP=${usedeps// /,} |
| 35 |
} |
| 36 |
_multilib_build_set_globals |
| 37 |
unset -f _multilib_build_set_globals |
Archives