diff options
Diffstat (limited to 'eclass/qt5-build.eclass')
-rw-r--r-- | eclass/qt5-build.eclass | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index b5d0b6428d9e..9a757ccedf2f 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 |