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 CF374138247 for ; Wed, 22 Jan 2014 17:45:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CE7AE0CFE; Wed, 22 Jan 2014 17:45:46 +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 022D5E0CFE for ; Wed, 22 Jan 2014 17:45:45 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37B0533FAE4 for ; Wed, 22 Jan 2014 17:45:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id EF796183B3 for ; Wed, 22 Jan 2014 17:45:43 +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: <1390412608.439d470f64b8c05da04c4cb3a6cb2d174cb9e543.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 439d470f64b8c05da04c4cb3a6cb2d174cb9e543 X-VCS-Branch: master Date: Wed, 22 Jan 2014 17:45:43 +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: 7812a7ca-5c35-418c-b1ad-6bf5838fb9f9 X-Archives-Hash: 93c50ead319b164e76d957b5b3095b89 commit: 439d470f64b8c05da04c4cb3a6cb2d174cb9e543 Author: Davide Pesavento gmail com> AuthorDate: Wed Jan 22 17:43:28 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 22 17:43:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=439d470f [qt5-build.eclass] Attempt to fix bug 451456, at least for non-qtbase modules. --- eclass/qt5-build.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 18954ef..264e158 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -377,8 +377,12 @@ qt5_prepare_env() { QT5_TESTSDIR=${QT5_DATADIR}/tests QT5_SYSCONFDIR=${EPREFIX}/etc/qt5 - # see mkspecs/features/qt_config.prf - export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" + if [[ ${QT5_MODULE} == "qtbase" ]]; then + # see mkspecs/features/qt_config.prf + # note: this could be the cause of bug 451456, so do it + # only when really needed, i.e. for qtbase modules + export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" + fi } # @FUNCTION: qt5_symlink_tools_to_buildtree