From: Michael Palimaka <kensington@gentoo.org>
Date: Mon, 9 Oct 2017 13:14:46 +0000 (+1100)
Subject: qt5-build.eclass: unset variables that, if set, cause configure to fail
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d9f1f66749b20415bd5f172e06f6d30fce413e97;p=gentoo.git

qt5-build.eclass: unset variables that, if set, cause configure to fail

Closes: https://bugs.gentoo.org/633838
---

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d933767b4a52..76dfc9b425ae 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -519,6 +519,11 @@ qt5_base_configure() {
 	tc-export AR CC CXX OBJDUMP RANLIB STRIP
 	export LD="$(tc-getCXX)"
 
+	# bug 633838
+	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+		unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
+	fi
+
 	# configure arguments
 	local conf=(
 		# installation paths