| 1 |
commit: f2e99107a9bf5b96497f666bde7bc0cbdb84663f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 27 22:01:10 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 28 21:40:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f2e99107 |
| 7 |
|
| 8 |
qt5-build.eclass: Introduce qt5_tools_configure |
| 9 |
|
| 10 |
This is run in src_configure for qttools modules unless |
| 11 |
QT5_TARGET_SUBDIRS is defined. |
| 12 |
|
| 13 |
Implementing an idea of Chiitoo in the linked PR. |
| 14 |
|
| 15 |
Closes: https://github.com/gentoo/qt/pull/218 |
| 16 |
Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 18 |
|
| 19 |
eclass/qt5-build.eclass | 31 +++++++++++++++++++++++++++++++ |
| 20 |
1 file changed, 31 insertions(+) |
| 21 |
|
| 22 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 23 |
index 9a757cce..d82f3d25 100644 |
| 24 |
--- a/eclass/qt5-build.eclass |
| 25 |
+++ b/eclass/qt5-build.eclass |
| 26 |
@@ -194,6 +194,9 @@ qt5-build_src_configure() { |
| 27 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
| 28 |
qt5_base_configure |
| 29 |
fi |
| 30 |
+ if [[ ${QT5_MINOR_VERSION} -ge 15 ]] && [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then |
| 31 |
+ qt5_tools_configure |
| 32 |
+ fi |
| 33 |
|
| 34 |
qt5_foreach_target_subdir qt5_qmake |
| 35 |
} |
| 36 |
@@ -670,6 +673,34 @@ qt5_base_configure() { |
| 37 |
|
| 38 |
} |
| 39 |
|
| 40 |
+# @FUNCTION: qt5_tools_configure |
| 41 |
+# @INTERNAL |
| 42 |
+# @DESCRIPTION: |
| 43 |
+# Disables modules other than ${PN} belonging to qttools. |
| 44 |
+qt5_tools_configure() { |
| 45 |
+ # configure arguments |
| 46 |
+ local qmakeargs=( |
| 47 |
+ -- |
| 48 |
+ # not packaged in Gentoo |
| 49 |
+ -no-feature-distancefieldgenerator |
| 50 |
+ -no-feature-kmap2qmap |
| 51 |
+ -no-feature-macdeployqt |
| 52 |
+ -no-feature-makeqpf |
| 53 |
+ -no-feature-qev |
| 54 |
+ -no-feature-qtattributionsscanner |
| 55 |
+ -no-feature-windeployqt |
| 56 |
+ -no-feature-winrtrunner |
| 57 |
+ ) |
| 58 |
+ |
| 59 |
+ local i |
| 60 |
+ for i in assistant designer linguist pixeltool qdbus qdoc qtdiag qtpaths qtplugininfo; do |
| 61 |
+ [[ ${PN} == ${i} ]] || qmakeargs+=( -no-feature-${i} ) |
| 62 |
+ done |
| 63 |
+ |
| 64 |
+ # allow the ebuild to override what we set here |
| 65 |
+ myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" ) |
| 66 |
+} |
| 67 |
+ |
| 68 |
# @FUNCTION: qt5_qmake_args |
| 69 |
# @INTERNAL |
| 70 |
# @DESCRIPTION: |
Archives