commit:     d9f1f66749b20415bd5f172e06f6d30fce413e97
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 13:14:46 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 11:15:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f1f667

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

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

 eclass/qt5-build.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d933767b4a5..76dfc9b425a 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

Reply via email to