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 92C0D1395ED for ; Tue, 4 Aug 2015 21:40:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 523BA14172; Tue, 4 Aug 2015 21:40:47 +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 036ED14172 for ; Tue, 4 Aug 2015 21:40:46 +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 F2F6A340902 for ; Tue, 4 Aug 2015 21:40:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55603C3 for ; Tue, 4 Aug 2015 21:40:44 +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: <1438723983.d74741b15fd18bd0f44cbd348a1752255ca19cb9.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: d74741b15fd18bd0f44cbd348a1752255ca19cb9 X-VCS-Branch: master Date: Tue, 4 Aug 2015 21:40:44 +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: c9b721b5-8e9b-4c74-967a-8efd3f96040c X-Archives-Hash: 20a763f2f5d77c0393399cfe537189e3 commit: d74741b15fd18bd0f44cbd348a1752255ca19cb9 Author: Davide Pesavento gentoo org> AuthorDate: Tue Aug 4 21:33:03 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Aug 4 21:33:03 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d74741b1 [qt5-build.eclass] New myqmakeargs variable to pass arguments to qmake from ebuilds. eclass/qt5-build.eclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 100a36c..a9dbe18 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -227,8 +227,10 @@ qt5-build_src_compile() { # @DESCRIPTION: # Runs tests in the target directories. qt5-build_src_test() { - # '-after SUBDIRS-=...' disables broken cmake tests (bug 474004) - qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake + # disable broken cmake tests (bug 474004) + local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake SUBDIRS-=installed_cmake) + + qt5_foreach_target_subdir qt5_qmake qt5_foreach_target_subdir emake # create a custom testrunner script that correctly sets @@ -663,6 +665,7 @@ qt5_qmake() { fi "${qmakepath}"/qmake \ + "${projectdir}" \ CONFIG+=$(usex debug debug release) \ CONFIG-=$(usex debug release debug) \ QMAKE_AR="$(tc-getAR) cqs" \ @@ -684,8 +687,7 @@ qt5_qmake() { QMAKE_LFLAGS="${LDFLAGS}" \ QMAKE_LFLAGS_RELEASE= \ QMAKE_LFLAGS_DEBUG= \ - "${projectdir}" \ - "$@" \ + "${myqmakeargs[@]}" \ || die "qmake failed (${projectdir#${S}/})" }