pesa 14/11/01 23:39:05 Modified: ChangeLog qmake-utils.eclass Log: eqmake4(): support new qmake install location.
Revision Changes Path 1.1399 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1399&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1399&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1398&r2=1.1399 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1398 retrieving revision 1.1399 diff -u -r1.1398 -r1.1399 --- ChangeLog 1 Nov 2014 17:34:28 -0000 1.1398 +++ ChangeLog 1 Nov 2014 23:39:05 -0000 1.1399 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1398 2014/11/01 17:34:28 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1399 2014/11/01 23:39:05 pesa Exp $ + + 01 Nov 2014; Davide Pesavento <p...@gentoo.org> qmake-utils.eclass: + eqmake4(): support new qmake install location (patch by mgorny). 01 Nov 2014; Andreas K. Huettel <dilfri...@gentoo.org> perl-module.eclass: Drop EAPI=0,1,2,3 support in perl-module.eclass, this time for real. Further 1.4 eclass/qmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.3&r2=1.4 Index: qmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qmake-utils.eclass 28 Jul 2014 21:19:52 -0000 1.3 +++ qmake-utils.eclass 1 Nov 2014 23:39:05 -0000 1.4 @@ -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 @@ [[ -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)" \
