| 1 |
commit: 17850705303f7a6f3a1498f71daa02f4a1cbccac |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 27 03:46:55 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 27 03:49:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=17850705 |
| 7 |
|
| 8 |
qt5-build.eclass: create a forwarding header for qtbase |
| 9 |
|
| 10 |
Since 5.8, the build system no longer creates a forwarding header causing the |
| 11 |
system config to be used instead of what was passed to configure. |
| 12 |
|
| 13 |
Gentoo-bug: 599636 |
| 14 |
|
| 15 |
eclass/qt5-build.eclass | 6 ++++++ |
| 16 |
1 file changed, 6 insertions(+) |
| 17 |
|
| 18 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 19 |
index b6c211bc..4c311493 100644 |
| 20 |
--- a/eclass/qt5-build.eclass |
| 21 |
+++ b/eclass/qt5-build.eclass |
| 22 |
@@ -680,6 +680,12 @@ qt5_base_configure() { |
| 23 |
"${S}"/configure "${conf[@]}" || die "configure failed" |
| 24 |
|
| 25 |
popd >/dev/null || die |
| 26 |
+ |
| 27 |
+ if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then |
| 28 |
+ # a forwarding header is no longer created since 5.8, causing the system |
| 29 |
+ # config to always be used. bug 599636 |
| 30 |
+ cp src/corelib/global/qconfig.h include/QtCore/ || die |
| 31 |
+ fi |
| 32 |
} |
| 33 |
|
| 34 |
# @FUNCTION: qt5_qmake |
Archives