| 1 |
commit: 508b9085799298f05bfa41418f62692c3da63f99 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 27 00:25:02 2016 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 27 00:25:02 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=508b9085 |
| 7 |
|
| 8 |
qt4-build-multilib.eclass: make sure QMAKESPEC is not set |
| 9 |
|
| 10 |
Gentoo-Bug: 583352 |
| 11 |
|
| 12 |
eclass/qt4-build-multilib.eclass | 6 +++++- |
| 13 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 16 |
index 8007f86..8e20a77 100644 |
| 17 |
--- a/eclass/qt4-build-multilib.eclass |
| 18 |
+++ b/eclass/qt4-build-multilib.eclass |
| 19 |
@@ -585,9 +585,13 @@ qt4_prepare_env() { |
| 20 |
QT4_EXAMPLESDIR=${QT4_DATADIR}/examples |
| 21 |
QT4_DEMOSDIR=${QT4_DATADIR}/demos |
| 22 |
QT4_SYSCONFDIR=${EPREFIX}/etc/qt4 |
| 23 |
- QMAKE_LIBDIR_QT=${QT4_LIBDIR} |
| 24 |
|
| 25 |
+ # are these still needed? |
| 26 |
+ QMAKE_LIBDIR_QT=${QT4_LIBDIR} |
| 27 |
export XDG_CONFIG_HOME="${T}" |
| 28 |
+ |
| 29 |
+ # can confuse qmake if set (bug 583352) |
| 30 |
+ unset QMAKESPEC |
| 31 |
} |
| 32 |
|
| 33 |
# @FUNCTION: qt4_foreach_target_subdir |
Archives