commit: 9f97fded3a21803c278e3dc6478327e43ee7f354 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 31 12:21:16 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Apr 9 21:36:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f97fded
qt5-build.eclass: Drop obsolete in-source build workaround for >=5.14.2 Fixed upstream in 5.11.1. See also: https://bugreports.qt.io/browse/QTBUG-37417 Upstream commit 67aa365d41ebfe082b4efcfd725e4d5f08be678c qtbase forwarding header was introduced to fix bug 599636 in commit: d82f92ed064996dfb187ef668d74ed5b05546b2d Closes: https://bugs.gentoo.org/676948 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/qt5-build.eclass | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index b5d0b6428d9..9a757ccedf2 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -104,10 +104,11 @@ EGIT_REPO_URI=( # @OUTPUT_VARIABLE # @DESCRIPTION: # Build directory for out-of-source builds. -case ${QT5_BUILD_TYPE} in - live) : ${QT5_BUILD_DIR:=${S}_build} ;; - release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312 -esac +if ver_test ${PV} -lt 5.14.2; then + : ${QT5_BUILD_DIR:=${S}} # workaround for bug 497312 +else + : ${QT5_BUILD_DIR:=${S}_build} +fi IUSE="debug test" @@ -658,7 +659,12 @@ qt5_base_configure() { # 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 + # ${S}/include does not exist in live sources + local basedir="${S}/" + if ver_test ${PV} -lt 5.14.2 || [[ ${QT5_BUILD_TYPE} == live ]]; then + basedir="" + fi + cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die popd >/dev/null || die
