diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2014-11-01 23:39:05 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2014-11-01 23:39:05 +0000 |
| commit | d620328f8f9c354d05ae50df25693a2f7cd5bb72 (patch) | |
| tree | 4c7317479f2bd5eda44115dfff9826308417b29d /eclass/qmake-utils.eclass | |
| parent | Version bump, bug #512094. Adds optional USE=tagsoup which should allow parsi... (diff) | |
| download | historical-d620328f8f9c354d05ae50df25693a2f7cd5bb72.tar.gz historical-d620328f8f9c354d05ae50df25693a2f7cd5bb72.tar.bz2 historical-d620328f8f9c354d05ae50df25693a2f7cd5bb72.zip | |
eqmake4(): support new qmake install location.
Diffstat (limited to 'eclass/qmake-utils.eclass')
| -rw-r--r-- | eclass/qmake-utils.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 8789a445b4d6..da8cba24d837 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.3 2014/07/28 21:19:52 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.4 2014/11/01 23:39:05 pesa Exp $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: @@ -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)" \ |