1 |
commit: ea1ae9b4c958d98b7cc7b26a26cf8972f658e451 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 28 03:23:41 2015 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 03:24:03 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ea1ae9b4 |
7 |
|
8 |
qt5-build.eclass: use 'readonly' instead of 'declare -g -r' |
9 |
|
10 |
The -g option to declare was added in bash-4.2, so we cannot |
11 |
rely on it (we still need to support EAPI 5). |
12 |
|
13 |
eclass/qt5-build.eclass | 34 +++++++++++++++++++--------------- |
14 |
1 file changed, 19 insertions(+), 15 deletions(-) |
15 |
|
16 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
17 |
index 0ab7770..7ad8cf4 100644 |
18 |
--- a/eclass/qt5-build.eclass |
19 |
+++ b/eclass/qt5-build.eclass |
20 |
@@ -381,21 +381,25 @@ qt_use_disable_mod() { |
21 |
qt5_prepare_env() { |
22 |
# setup installation directories |
23 |
# note: keep paths in sync with qmake-utils.eclass |
24 |
- declare -g -r QT5_PREFIX=${EPREFIX}/usr |
25 |
- declare -g -r QT5_HEADERDIR=${QT5_PREFIX}/include/qt5 |
26 |
- declare -g -r QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir) |
27 |
- declare -g -r QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5 |
28 |
- declare -g -r QT5_BINDIR=${QT5_ARCHDATADIR}/bin |
29 |
- declare -g -r QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins |
30 |
- declare -g -r QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec |
31 |
- declare -g -r QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports |
32 |
- declare -g -r QT5_QMLDIR=${QT5_ARCHDATADIR}/qml |
33 |
- declare -g -r QT5_DATADIR=${QT5_PREFIX}/share/qt5 |
34 |
- declare -g -r QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} |
35 |
- declare -g -r QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations |
36 |
- declare -g -r QT5_EXAMPLESDIR=${QT5_DATADIR}/examples |
37 |
- declare -g -r QT5_TESTSDIR=${QT5_DATADIR}/tests |
38 |
- declare -g -r QT5_SYSCONFDIR=${EPREFIX}/etc/xdg |
39 |
+ QT5_PREFIX=${EPREFIX}/usr |
40 |
+ QT5_HEADERDIR=${QT5_PREFIX}/include/qt5 |
41 |
+ QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir) |
42 |
+ QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5 |
43 |
+ QT5_BINDIR=${QT5_ARCHDATADIR}/bin |
44 |
+ QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins |
45 |
+ QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec |
46 |
+ QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports |
47 |
+ QT5_QMLDIR=${QT5_ARCHDATADIR}/qml |
48 |
+ QT5_DATADIR=${QT5_PREFIX}/share/qt5 |
49 |
+ QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} |
50 |
+ QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations |
51 |
+ QT5_EXAMPLESDIR=${QT5_DATADIR}/examples |
52 |
+ QT5_TESTSDIR=${QT5_DATADIR}/tests |
53 |
+ QT5_SYSCONFDIR=${EPREFIX}/etc/xdg |
54 |
+ readonly QT5_PREFIX QT5_HEADERDIR QT5_LIBDIR QT5_ARCHDATADIR \ |
55 |
+ QT5_BINDIR QT5_PLUGINDIR QT5_LIBEXECDIR QT5_IMPORTDIR \ |
56 |
+ QT5_QMLDIR QT5_DATADIR QT5_DOCDIR QT5_TRANSLATIONDIR \ |
57 |
+ QT5_EXAMPLESDIR QT5_TESTSDIR QT5_SYSCONFDIR |
58 |
|
59 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
60 |
# see mkspecs/features/qt_config.prf |