commit: 90251f5339832b181824c199f54290d4a21995c5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 03:46:55 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 01:46:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90251f53
qt5-build.eclass: create a forwarding header for qtbase
Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.
Gentoo-bug: 599636
eclass/qt5-build.eclass | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b6c211bcad7..ef6865ba337 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -679,7 +679,14 @@ qt5_base_configure() {
einfo "Configuring with: ${conf[@]}"
"${S}"/configure "${conf[@]}" || die "configure failed"
+ if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+ # a forwarding header is no longer created since 5.8, causing
the system
+ # config to always be used. bug 599636
+ cp src/corelib/global/qconfig.h include/QtCore/ || die
+ fi
+
popd >/dev/null || die
+
}
# @FUNCTION: qt5_qmake
