[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     e4c940086141d6a45daefb705c261f170f178bde
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 21:25:17 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 21:27:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c94008

multilib-build.eclass: Replace non-portable use of 'declare -g'

Replace uses of 'declare -g -r' (bash-4.2+) with 'readonly'. Reported
by Arfrever.

 eclass/multilib-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 0d4ffd9..91885a4 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -38,7 +38,7 @@ inherit multibuild multilib
 # Please contact multilib before modifying this list. This way we can
 # ensure that every *preliminary* work is done and the multilib can be
 # extended safely.
-declare -g -r _MULTILIB_FLAGS=(
+readonly _MULTILIB_FLAGS=(
        abi_x86_32:x86,x86_fbsd,x86_freebsd,x86_linux,x86_macos,x86_solaris
        
abi_x86_64:amd64,amd64_fbsd,x64_freebsd,amd64_linux,x64_macos,x64_solaris
        abi_x86_x32:x32
@@ -124,7 +124,7 @@ _multilib_build_set_globals() {
        local usedeps=${flags[@]/%/(-)?}
 
        IUSE=${flags[*]}
-       declare -g -r MULTILIB_USEDEP=${usedeps// /,}
+       readonly MULTILIB_USEDEP=${usedeps// /,}
 }
 _multilib_build_set_globals
 unset -f _multilib_build_set_globals