| 1 |
commit: 439d470f64b8c05da04c4cb3a6cb2d174cb9e543 |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jan 22 17:43:28 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 22 17:43:28 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=439d470f |
| 7 |
|
| 8 |
[qt5-build.eclass] Attempt to fix bug 451456, at least for non-qtbase modules. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt5-build.eclass | 8 ++++++-- |
| 12 |
1 file changed, 6 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 15 |
index 18954ef..264e158 100644 |
| 16 |
--- a/eclass/qt5-build.eclass |
| 17 |
+++ b/eclass/qt5-build.eclass |
| 18 |
@@ -377,8 +377,12 @@ qt5_prepare_env() { |
| 19 |
QT5_TESTSDIR=${QT5_DATADIR}/tests |
| 20 |
QT5_SYSCONFDIR=${EPREFIX}/etc/qt5 |
| 21 |
|
| 22 |
- # see mkspecs/features/qt_config.prf |
| 23 |
- export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" |
| 24 |
+ if [[ ${QT5_MODULE} == "qtbase" ]]; then |
| 25 |
+ # see mkspecs/features/qt_config.prf |
| 26 |
+ # note: this could be the cause of bug 451456, so do it |
| 27 |
+ # only when really needed, i.e. for qtbase modules |
| 28 |
+ export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" |
| 29 |
+ fi |
| 30 |
} |
| 31 |
|
| 32 |
# @FUNCTION: qt5_symlink_tools_to_buildtree |
Archives