From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DA8A01387D3 for ; Sun, 26 Oct 2014 01:22:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1AE6E0D45; Sun, 26 Oct 2014 01:22:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5E3EE0D3C for ; Sun, 26 Oct 2014 01:22:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC1FB3404D4 for ; Sun, 26 Oct 2014 01:22:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85B4A8BF3 for ; Sun, 26 Oct 2014 01:22:55 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1414286447.f469926ea6b250036778faffdbddbf569b51221e.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: f469926ea6b250036778faffdbddbf569b51221e X-VCS-Branch: master Date: Sun, 26 Oct 2014 01:22:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: de4dd938-206f-4633-aa61-612a47ea5e78 X-Archives-Hash: fb42c5a8bdfbeee825fbc46460842d27 commit: f469926ea6b250036778faffdbddbf569b51221e Author: Michał Górny gentoo org> AuthorDate: Mon Oct 20 20:47:26 2014 +0000 Commit: Davide Pesavento gentoo 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)" \