pesa 15/08/07 01:07:09 Modified: ChangeLog qt5-build.eclass Log: Allow passing arguments to qmake from ebuilds via the myqmakeargs array.
Revision Changes Path 1.1748 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1748&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1748&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1747&r2=1.1748 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1747 retrieving revision 1.1748 diff -u -r1.1747 -r1.1748 --- ChangeLog 6 Aug 2015 08:20:33 -0000 1.1747 +++ ChangeLog 7 Aug 2015 01:07:09 -0000 1.1748 @@ -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 <p...@gentoo.org> qt5-build.eclass: + Allow passing arguments to qmake from ebuilds via the myqmakeargs array. 06 Aug 2015; Sergei Trofimovich <sly...@gentoo.org> ghc-package.eclass, haskell-cabal.eclass: 1.22 eclass/qt5-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.21&r2=1.22 Index: qt5-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- qt5-build.eclass 13 Jul 2015 00:51:16 -0000 1.21 +++ qt5-build.eclass 7 Aug 2015 01:07:09 -0000 1.22 @@ -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 @@ # @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 @@ fi "${qmakepath}"/qmake \ + "${projectdir}" \ CONFIG+=$(usex debug debug release) \ CONFIG-=$(usex debug release debug) \ QMAKE_AR="$(tc-getAR) cqs" \ @@ -682,8 +685,7 @@ QMAKE_LFLAGS="${LDFLAGS}" \ QMAKE_LFLAGS_RELEASE= \ QMAKE_LFLAGS_DEBUG= \ - "${projectdir}" \ - "$@" \ + "${myqmakeargs[@]}" \ || die "qmake failed (${projectdir#${S}/})" }
