[gentoo-commits] repo/gentoo:master commit in: eclass/

[Davide Pesavento]

commit:     508b9085799298f05bfa41418f62692c3da63f99
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 00:25:02 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 27 00:25:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=508b9085

qt4-build-multilib.eclass: make sure QMAKESPEC is not set

Gentoo-Bug: 583352

 eclass/qt4-build-multilib.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 8007f86..8e20a77 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -585,9 +585,13 @@ qt4_prepare_env() {
        QT4_EXAMPLESDIR=${QT4_DATADIR}/examples
        QT4_DEMOSDIR=${QT4_DATADIR}/demos
        QT4_SYSCONFDIR=${EPREFIX}/etc/qt4
-       QMAKE_LIBDIR_QT=${QT4_LIBDIR}
 
+       # are these still needed?
+       QMAKE_LIBDIR_QT=${QT4_LIBDIR}
        export XDG_CONFIG_HOME="${T}"
+
+       # can confuse qmake if set (bug 583352)
+       unset QMAKESPEC
 }
 
 # @FUNCTION: qt4_foreach_target_subdir