diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-12-11 22:26:45 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-12-11 22:27:19 +0100 |
| commit | 44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9 (patch) | |
| tree | ce99f26e85dd3d832f5ecfa8606598a5c27d5a69 /eclass | |
| parent | multilib-build.eclass: Replace non-portable use of 'declare -g' (diff) | |
| download | gentoo-44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9.tar.gz gentoo-44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9.tar.bz2 gentoo-44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9.zip | |
python*-r1.eclass: Replace non-portable use of 'declare -g'
Replace uses of 'declare -g -r' (bash-4.2+) with 'readonly'. Reported
by Arfrever.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python-any-r1.eclass | 2 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 4 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 2 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 82ead76edf18..846c0da95898 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -133,7 +133,7 @@ _python_any_set_globals() { PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}" done - declare -g -r PYTHON_DEPS="|| ( ${PYTHON_DEPS})" + readonly PYTHON_DEPS="|| ( ${PYTHON_DEPS})" } _python_any_set_globals unset -f _python_any_set_globals diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 4b9c6f36e55d..5c1f1b3694e0 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -216,8 +216,8 @@ _python_set_globals() { optflags+=,${flags_st[@]/%/(-)} IUSE=${flags[*]} - declare -g -r PYTHON_REQUIRED_USE="|| ( ${flags[*]} )" - declare -g -r PYTHON_USEDEP=${optflags// /,} + readonly PYTHON_REQUIRED_USE="|| ( ${flags[*]} )" + readonly PYTHON_USEDEP=${optflags// /,} # 1) well, python-exec would suffice as an RDEP # but no point in making this overcomplex, BDEP doesn't hurt anyone diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 158229503f99..3c33f3731d53 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -238,7 +238,7 @@ _python_single_set_globals() { PYTHON_DEPS+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) " done fi - declare -g -r PYTHON_USEDEP=${optflags// /,} + readonly PYTHON_USEDEP=${optflags// /,} # 1) well, python-exec would suffice as an RDEP # but no point in making this overcomplex, BDEP doesn't hurt anyone diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index cf0e13496245..42c33eb985d5 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -40,7 +40,7 @@ inherit toolchain-funcs # @INTERNAL # @DESCRIPTION: # All supported Python implementations, most preferred last. -declare -g -r _PYTHON_ALL_IMPLS=( +readonly _PYTHON_ALL_IMPLS=( python2_7 python3_3 python3_4 python3_5 pypy pypy3 |