commit:     bba86bf1171f811e5f8fe04b305d35b01f5f9a5a
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:13:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bba86bf1

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

Bug: 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 d933767b..76dfc9b4 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