From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBDC6138350 for ; Thu, 9 Apr 2020 19:45:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5333E08D3; Thu, 9 Apr 2020 19:45:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7CE4E08D3 for ; Thu, 9 Apr 2020 19:45:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70AF134EF08 for ; Thu, 9 Apr 2020 19:45:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 295722B for ; Thu, 9 Apr 2020 19:45:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1586457151.548df2493d9801b2503f412ec8c424418cb7721b.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 548df2493d9801b2503f412ec8c424418cb7721b X-VCS-Branch: master Date: Thu, 9 Apr 2020 19:45:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f3c01190-f3ff-4842-986a-abac06cc522c X-Archives-Hash: e2296d2684b807fa912638818f261714 commit: 548df2493d9801b2503f412ec8c424418cb7721b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 31 12:21:16 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 9 18:32:31 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=548df249 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 Bug: https://bugs.gentoo.org/497312 Bug: https://bugs.gentoo.org/676948 Signed-off-by: Andreas Sturmlechner 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 b5d0b642..9a757cce 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