| 1 |
commit: ff79c14ece9b5fbd2e13a897e67d37ab241a3b68 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 18:00:42 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 30 17:22:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ff79c14e |
| 7 |
|
| 8 |
qt5-build.eclass: Disable 'global_docs' |
| 9 |
|
| 10 |
The global_docs target is not needed any longer due to the following |
| 11 |
upstream change: |
| 12 |
|
| 13 |
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=a7ddef139415f74f9ba8dc84a2f15105149ca5e8 |
| 14 |
|
| 15 |
Gentoo-Bug: https://bugs.gentoo.org/596054 |
| 16 |
|
| 17 |
eclass/qt5-build.eclass | 15 ++++++++++++--- |
| 18 |
1 file changed, 12 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 21 |
index f66fde0..9727ce7 100644 |
| 22 |
--- a/eclass/qt5-build.eclass |
| 23 |
+++ b/eclass/qt5-build.eclass |
| 24 |
@@ -283,9 +283,18 @@ qt5-build_src_install() { |
| 25 |
qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets |
| 26 |
fi |
| 27 |
|
| 28 |
- set -- emake INSTALL_ROOT="${D}" \ |
| 29 |
- ${qmake_install_target} \ |
| 30 |
- install_{syncqt,mkspecs,global_docs} |
| 31 |
+ if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then |
| 32 |
+ |
| 33 |
+ set -- emake INSTALL_ROOT="${D}" \ |
| 34 |
+ ${qmake_install_target} \ |
| 35 |
+ install_{syncqt,mkspecs} |
| 36 |
+ else |
| 37 |
+ |
| 38 |
+ set -- emake INSTALL_ROOT="${D}" \ |
| 39 |
+ ${qmake_install_target} \ |
| 40 |
+ install_{syncqt,mkspecs,global_docs} |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
einfo "Running $*" |
| 44 |
"$@" |
Archives