diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-08-07 01:07:09 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-08-07 01:07:09 +0000 |
| commit | a657e6e76da4f3249f23ffefa97e57cc81426ab4 (patch) | |
| tree | 5c57d54557ff4b07281fb36f4ca82100b143fb8b /eclass | |
| parent | Readd removed version. (diff) | |
| download | historical-a657e6e76da4f3249f23ffefa97e57cc81426ab4.tar.gz historical-a657e6e76da4f3249f23ffefa97e57cc81426ab4.tar.bz2 historical-a657e6e76da4f3249f23ffefa97e57cc81426ab4.zip | |
Allow passing arguments to qmake from ebuilds via the myqmakeargs array.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 77bdc2bf64d5..9a52ad693750 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1747 2015/08/06 08:20:33 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1748 2015/08/07 01:07:09 pesa Exp $ + + 07 Aug 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass: + Allow passing arguments to qmake from ebuilds via the myqmakeargs array. 06 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass, haskell-cabal.eclass: diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 2eafdcbc07f5..83c103f83e12 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.21 2015/07/13 00:51:16 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.22 2015/08/07 01:07:09 pesa Exp $ # @ECLASS: qt5-build.eclass # @MAINTAINER: @@ -225,8 +225,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 @@ -661,6 +663,7 @@ qt5_qmake() { fi "${qmakepath}"/qmake \ + "${projectdir}" \ CONFIG+=$(usex debug debug release) \ CONFIG-=$(usex debug release debug) \ QMAKE_AR="$(tc-getAR) cqs" \ @@ -682,8 +685,7 @@ qt5_qmake() { QMAKE_LFLAGS="${LDFLAGS}" \ QMAKE_LFLAGS_RELEASE= \ QMAKE_LFLAGS_DEBUG= \ - "${projectdir}" \ - "$@" \ + "${myqmakeargs[@]}" \ || die "qmake failed (${projectdir#${S}/})" } |