From: Davide Pesavento <pesa@gentoo.org>
Date: Fri, 27 May 2016 00:25:02 +0000 (+0200)
Subject: qt4-build-multilib.eclass: make sure QMAKESPEC is not set
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=508b9085799298f05bfa41418f62692c3da63f99;p=gentoo.git

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 8007f862a8c7..8e20a77fdb64 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