diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2017-09-23 00:26:01 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2017-09-23 00:44:48 +1000 |
| commit | 66dcf031932854324c8fbe1be883e66a66988968 (patch) | |
| tree | ac5fca490338bf4e4c7218fc182c99e342ce6122 /eclass/qt5-build.eclass | |
| parent | qt5-build.eclass: adapt to changes in Qt 5.9 git (diff) | |
| download | qt-66dcf031932854324c8fbe1be883e66a66988968.tar.gz qt-66dcf031932854324c8fbe1be883e66a66988968.tar.bz2 qt-66dcf031932854324c8fbe1be883e66a66988968.zip | |
qt5-build.eclass: fix 5.9.9999 and later live ebuilds
qconfig.h is created at configure time in $QT5_BUILD_DIR. Live ebuilds are
built out-of-source while release are not. Since the copy was happening in
the source directory, a fatal error occurred in live ebuilds as qconfig.h
is not where it was expected.
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index fa775d36..fca63af4 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -680,13 +680,14 @@ qt5_base_configure() { einfo "Configuring with: ${conf[@]}" "${S}"/configure "${conf[@]}" || die "configure failed" - popd >/dev/null || die - 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 |