Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Sun, 27 Dec 2015 02:32:49
Message-Id: 1451169601.6283242f80ac9455e090c1fa31d4c4eb4ed79edc.pesa@gentoo
1 commit: 6283242f80ac9455e090c1fa31d4c4eb4ed79edc
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 26 22:40:01 2015 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 26 22:40:01 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6283242f
7
8 qt5-build.eclass: declare some variables readonly
9
10 eclass/qt5-build.eclass | 33 +++++++++++++++++----------------
11 1 file changed, 17 insertions(+), 16 deletions(-)
12
13 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
14 index ec4aa39..7bac25e 100644
15 --- a/eclass/qt5-build.eclass
16 +++ b/eclass/qt5-build.eclass
17 @@ -23,7 +23,7 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx
18 HOMEPAGE="https://www.qt.io/"
19 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
20
21 -QT5_MINOR_VERSION=$(get_version_component_range 2)
22 +declare -r QT5_MINOR_VERSION=$(get_version_component_range 2)
23
24 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
25 # IMPORTANT: add a subslot dependency to your package only if you are sure
26 @@ -65,6 +65,7 @@ case ${PV} in
27 S=${WORKDIR}/${MY_P}
28 ;;
29 esac
30 +readonly QT5_BUILD_TYPE
31
32 EGIT_REPO_URI=(
33 "git://code.qt.io/qt/${QT5_MODULE}.git"
34 @@ -398,21 +399,21 @@ qt_use_disable_mod() {
35 qt5_prepare_env() {
36 # setup installation directories
37 # note: keep paths in sync with qmake-utils.eclass
38 - QT5_PREFIX=${EPREFIX}/usr
39 - QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
40 - QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
41 - QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
42 - QT5_BINDIR=${QT5_ARCHDATADIR}/bin
43 - QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
44 - QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
45 - QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
46 - QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
47 - QT5_DATADIR=${QT5_PREFIX}/share/qt5
48 - QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
49 - QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
50 - QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
51 - QT5_TESTSDIR=${QT5_DATADIR}/tests
52 - QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
53 + declare -g -r QT5_PREFIX=${EPREFIX}/usr
54 + declare -g -r QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
55 + declare -g -r QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
56 + declare -g -r QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
57 + declare -g -r QT5_BINDIR=${QT5_ARCHDATADIR}/bin
58 + declare -g -r QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
59 + declare -g -r QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
60 + declare -g -r QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
61 + declare -g -r QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
62 + declare -g -r QT5_DATADIR=${QT5_PREFIX}/share/qt5
63 + declare -g -r QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
64 + declare -g -r QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
65 + declare -g -r QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
66 + declare -g -r QT5_TESTSDIR=${QT5_DATADIR}/tests
67 + declare -g -r QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
68
69 if [[ ${QT5_MODULE} == qtbase ]]; then
70 # see mkspecs/features/qt_config.prf