[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     ea1ae9b4c958d98b7cc7b26a26cf8972f658e451
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 03:23:41 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 03:24:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ea1ae9b4

qt5-build.eclass: use 'readonly' instead of 'declare -g -r'

The -g option to declare was added in bash-4.2, so we cannot
rely on it (we still need to support EAPI 5).

 eclass/qt5-build.eclass | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0ab7770..7ad8cf4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -381,21 +381,25 @@ qt_use_disable_mod() {
 qt5_prepare_env() {
        # setup installation directories
        # note: keep paths in sync with qmake-utils.eclass
-       declare -g -r QT5_PREFIX=${EPREFIX}/usr
-       declare -g -r QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
-       declare -g -r QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
-       declare -g -r QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
-       declare -g -r QT5_BINDIR=${QT5_ARCHDATADIR}/bin
-       declare -g -r QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
-       declare -g -r QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
-       declare -g -r QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
-       declare -g -r QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
-       declare -g -r QT5_DATADIR=${QT5_PREFIX}/share/qt5
-       declare -g -r QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
-       declare -g -r QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
-       declare -g -r QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
-       declare -g -r QT5_TESTSDIR=${QT5_DATADIR}/tests
-       declare -g -r QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
+       QT5_PREFIX=${EPREFIX}/usr
+       QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
+       QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
+       QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
+       QT5_BINDIR=${QT5_ARCHDATADIR}/bin
+       QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
+       QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
+       QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
+       QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
+       QT5_DATADIR=${QT5_PREFIX}/share/qt5
+       QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+       QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
+       QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
+       QT5_TESTSDIR=${QT5_DATADIR}/tests
+       QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
+       readonly QT5_PREFIX QT5_HEADERDIR QT5_LIBDIR QT5_ARCHDATADIR \
+               QT5_BINDIR QT5_PLUGINDIR QT5_LIBEXECDIR QT5_IMPORTDIR \
+               QT5_QMLDIR QT5_DATADIR QT5_DOCDIR QT5_TRANSLATIONDIR \
+               QT5_EXAMPLESDIR QT5_TESTSDIR QT5_SYSCONFDIR
 
        if [[ ${QT5_MODULE} == qtbase ]]; then
                # see mkspecs/features/qt_config.prf