summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-10-10 00:14:46 +1100
committerMichael Palimaka <kensington@gentoo.org>2017-10-10 22:15:46 +1100
commitd9f1f66749b20415bd5f172e06f6d30fce413e97 (patch)
tree2c29f3f7b767fed4c66c6555d94bb4359e64e90e
parentdev-qt/qtvirtualkeyboard: add ~arm keyword (diff)
downloadgentoo-d9f1f66749b20415bd5f172e06f6d30fce413e97.tar.gz
gentoo-d9f1f66749b20415bd5f172e06f6d30fce413e97.tar.bz2
gentoo-d9f1f66749b20415bd5f172e06f6d30fce413e97.zip
qt5-build.eclass: unset variables that, if set, cause configure to fail
Closes: https://bugs.gentoo.org/633838
-rw-r--r--eclass/qt5-build.eclass5
1 files changed, 5 insertions, 0 deletions
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