diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2017-08-27 13:46:55 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2017-10-08 12:46:24 +1100 |
| commit | 90251f5339832b181824c199f54290d4a21995c5 (patch) | |
| tree | 833486cadf56664c010150aa875be7606decf747 /eclass | |
| parent | qt5-build.eclass: simplify conditional since 5.8.0 is gone (diff) | |
| download | gentoo-90251f5339832b181824c199f54290d4a21995c5.tar.gz gentoo-90251f5339832b181824c199f54290d4a21995c5.tar.bz2 gentoo-90251f5339832b181824c199f54290d4a21995c5.zip | |
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
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index b6c211bcad71..ef6865ba3377 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 |