From: Davide Pesavento Date: Mon, 17 Nov 2014 02:15:42 +0000 (+0000) Subject: Stop setting QTDIR. It's only relevant when building qt itself, and in any case qmake... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73dd4a8a77c5627a23d519f5d18add56485a449c;p=gentoo.git Stop setting QTDIR. It's only relevant when building qt itself, and in any case qmake doesn't use it. --- diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 59b4f1112c73..c9f1a3e92ff9 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1424 2014/11/17 00:24:43 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1425 2014/11/17 02:15:42 pesa Exp $ + + 17 Nov 2014; Davide Pesavento qmake-utils.eclass: + Stop setting QTDIR. It's only relevant when building qt itself, and in any + case qmake doesn't use it. 17 Nov 2014; Davide Pesavento qt4-build-multilib.eclass: Add blocker on emul-linux-x86-qtlibs wrt bug 529370. diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index da8cba24d837..dac5b244e63b 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.4 2014/11/01 23:39:05 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.5 2014/11/17 02:15:42 pesa Exp $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: @@ -164,7 +164,6 @@ eqmake4() { "${qmake_path}" \ -makefile \ - QTDIR="${EPREFIX}"/usr/$(get_libdir) \ QMAKE_AR="$(tc-getAR) cqs" \ QMAKE_CC="$(tc-getCC)" \ QMAKE_CXX="$(tc-getCXX)" \