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

Gentoo-Bug: 583352

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 8007f862a8c7953ac99309a59bcd2bce84e4e9bb..8e20a77fdb6439dced94363cf61321ae5b1b38c5 100644 (file)
--- 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