diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-08-04 23:33:03 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-08-04 23:33:03 +0200 |
| commit | d74741b15fd18bd0f44cbd348a1752255ca19cb9 (patch) | |
| tree | 725b29a2fb0cd8a1a615fdca0b023ccec7de9b89 /eclass/qt5-build.eclass | |
| parent | [dev-python/sip] Moved to gentoo-x86. (diff) | |
| download | qt-d74741b15fd18bd0f44cbd348a1752255ca19cb9.tar.gz qt-d74741b15fd18bd0f44cbd348a1752255ca19cb9.tar.bz2 qt-d74741b15fd18bd0f44cbd348a1752255ca19cb9.zip | |
[qt5-build.eclass] New myqmakeargs variable to pass arguments to qmake from ebuilds.
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 100a36c0..a9dbe180 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}/})" } |