commit:     6283242f80ac9455e090c1fa31d4c4eb4ed79edc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 22:40:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 22:40:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6283242f

qt5-build.eclass: declare some variables readonly

 eclass/qt5-build.eclass | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ec4aa39..7bac25e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -23,7 +23,7 @@ inherit eutils flag-o-matic toolchain-funcs versionator 
virtualx
 HOMEPAGE="https://www.qt.io/";
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
-QT5_MINOR_VERSION=$(get_version_component_range 2)
+declare -r QT5_MINOR_VERSION=$(get_version_component_range 2)
 
 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
        # IMPORTANT: add a subslot dependency to your package only if you are 
sure
@@ -65,6 +65,7 @@ case ${PV} in
                S=${WORKDIR}/${MY_P}
                ;;
 esac
+readonly QT5_BUILD_TYPE
 
 EGIT_REPO_URI=(
        "git://code.qt.io/qt/${QT5_MODULE}.git"
@@ -398,21 +399,21 @@ qt_use_disable_mod() {
 qt5_prepare_env() {
        # setup installation directories
        # note: keep paths in sync with qmake-utils.eclass
-       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
+       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
 
        if [[ ${QT5_MODULE} == qtbase ]]; then
                # see mkspecs/features/qt_config.prf

Reply via email to