commit: f469926ea6b250036778faffdbddbf569b51221e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 20:47:26 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 01:20:47 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f469926e
[qmake-utils.eclass] eqmake4: always use Qt4's qmake.
Use direct path to Qt4 binary location, fallback to /usr/bin.
---
eclass/qmake-utils.eclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index b91e3e0..61fb280 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -158,10 +158,13 @@ eqmake4() {
[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop
- "${EPREFIX}"/usr/bin/qmake \
+ # determine qmake binary location
+ local qmake_path=${EPREFIX}/usr/$(get_libdir)/qt4/bin/qmake
+ [[ ! -x ${qmake_path} ]] && qmake_path=${EPREFIX}/usr/bin/qmake
+
+ "${qmake_path}" \
-makefile \
QTDIR="${EPREFIX}"/usr/$(get_libdir) \
- QMAKE="${EPREFIX}"/usr/bin/qmake \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
QMAKE_CXX="$(tc-getCXX)" \
