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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 633B2158009 for ; Thu, 22 Jun 2023 15:53:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56D44E0870; Thu, 22 Jun 2023 15:53:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C06BE0864 for ; Thu, 22 Jun 2023 15:53:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BBA3340D1B for ; Thu, 22 Jun 2023 15:53:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C563990 for ; Thu, 22 Jun 2023 15:53:47 +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: <1687449217.4100f922ad8fd7df2186d8e8544511a7d0c0d9ba.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: 4100f922ad8fd7df2186d8e8544511a7d0c0d9ba X-VCS-Branch: master Date: Thu, 22 Jun 2023 15:53:47 +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: e7dcea02-0c98-4ece-a7b8-4dfc89d88acf X-Archives-Hash: 92d3788239b22abc69ff37797a3eb3d1 commit: 4100f922ad8fd7df2186d8e8544511a7d0c0d9ba Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 18 16:04:40 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 22 15:53:37 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4100f922 qt5-build.eclass: Import out-of-source quirks from qdoc/qtlocation We probably won't get this fixed in Qt5 cycle anymore. Standardises the quirk via new internal helper function qt5_tools_oos_quirk() to avoid qt5_qmake usage in ebuilds. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 8779d5e9..31e3be2e 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -720,9 +720,44 @@ qt5_tools_configure() { # allow the ebuild to override what we set here myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" ) - mkdir -p "${QT5_BUILD_DIR}" || die + # out-of-source build quirks + case ${PN} in + qdoc) + # bug 676948 + qt5_tools_oos_quirk qtqdoc-config.pri src/qdoc + ;; + qtlocation) + # src/plugins/geoservices requires files that are only generated + # when qmake is run in the root directory. bug 633776 + qt5_tools_oos_quirk qtlocation-config.pri src/location + ;; + *) ;; + esac + + qt5_tools_oos_quirk qttools-config.pri +} + +# @FUNCTION: qt5_tools_oos_quirk +# @INTERNAL +# @USAGE: or +# @DESCRIPTION: +# Quirk for out-of-source builds. Runs qmake in root directory, copies +# generated pri from source to build dir . +# If no is given, is copied to ${QT5_BUILD_DIR}. +qt5_tools_oos_quirk() { + if [[ "$#" == 2 ]]; then + local source="${2}/${1}" + local dest="${QT5_BUILD_DIR}/${2}" + elif [[ "$#" == 1 ]]; then + local source="${1}" + local dest="${QT5_BUILD_DIR}" + else + die "${FUNCNAME[0]} must be passed either one or two arguments" + fi + + mkdir -p "${dest}" || die qt5_qmake "${QT5_BUILD_DIR}" - cp qttools-config.pri "${QT5_BUILD_DIR}" || die + cp "${source}" "${dest}" || die } # @FUNCTION: qt5_qmake_args