summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2016-05-27 02:25:02 +0200
committerDavide Pesavento <pesa@gentoo.org>2016-05-27 02:25:02 +0200
commit508b9085799298f05bfa41418f62692c3da63f99 (patch)
tree9f6216c5859ded4d0253844d75129367d98a0c2e
parentRevert "profiles: Disable m68k-mint profile since it lacks proper definitions" (diff)
downloadgentoo-508b9085.tar.gz
gentoo-508b9085.tar.bz2
gentoo-508b9085.zip
qt4-build-multilib.eclass: make sure QMAKESPEC is not set
Gentoo-Bug: 583352
-rw-r--r--eclass/qt4-build-multilib.eclass6
1 files changed, 5 insertions, 1 deletions
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