From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02B401582EF for ; Thu, 20 Feb 2025 22:38:52 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D7E113430DE for ; Thu, 20 Feb 2025 22:38:52 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CCBF21102A2; Thu, 20 Feb 2025 22:38:51 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C08311102A2 for ; Thu, 20 Feb 2025 22:38:51 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45E073430D2 for ; Thu, 20 Feb 2025 22:38:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E33E1236 for ; Thu, 20 Feb 2025 22:38:49 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1740091066.a631496f102c4b1dbc40e643eccb7f477fd24e53.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtbase/qtbase-6.8.2-r2.ebuild dev-qt/qtbase/qtbase-6.8.9999.ebuild dev-qt/qtbase/qtbase-6.9.9999.ebuild dev-qt/qtbase/qtbase-6.9999.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: a631496f102c4b1dbc40e643eccb7f477fd24e53 X-VCS-Branch: master Date: Thu, 20 Feb 2025 22:38: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: 1b21296e-1fbe-41fa-a5ec-e04cc2abcd9a X-Archives-Hash: 5d59975efafbff274b674d0dec894686 commit: a631496f102c4b1dbc40e643eccb7f477fd24e53 Author: James Le Cuirot gentoo org> AuthorDate: Thu Feb 20 22:37:13 2025 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Feb 20 22:37:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a631496f dev-qt/qtbase: Fix cross-compiling with some CMake variables Closes: https://bugs.gentoo.org/942359 Closes: https://bugs.gentoo.org/949214 Signed-off-by: James Le Cuirot gentoo.org> dev-qt/qtbase/qtbase-6.8.2-r2.ebuild | 6 ++++++ dev-qt/qtbase/qtbase-6.8.9999.ebuild | 6 ++++++ dev-qt/qtbase/qtbase-6.9.9999.ebuild | 8 +++++++- dev-qt/qtbase/qtbase-6.9999.ebuild | 8 +++++++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild index 2a5d8cbc90ac..12aa4d2a5bb8 100644 --- a/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.2-r2.ebuild @@ -274,6 +274,12 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) + tc-is-cross-compiler && mycmakeargs+=( + -DQT_HOST_PATH="${BROOT}"/usr + -DQT_FORCE_BUILD_TOOLS=ON + -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON + ) + qt6-build_src_configure } diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild index a4a17c32f1ed..7e7d1bd57609 100644 --- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild @@ -272,6 +272,12 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) + tc-is-cross-compiler && mycmakeargs+=( + -DQT_HOST_PATH="${BROOT}"/usr + -DQT_FORCE_BUILD_TOOLS=ON + -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON + ) + qt6-build_src_configure } diff --git a/dev-qt/qtbase/qtbase-6.9.9999.ebuild b/dev-qt/qtbase/qtbase-6.9.9999.ebuild index ca27923c277e..8a4abb2947a4 100644 --- a/dev-qt/qtbase/qtbase-6.9.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -272,6 +272,12 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) + tc-is-cross-compiler && mycmakeargs+=( + -DQT_HOST_PATH="${BROOT}"/usr + -DQT_FORCE_BUILD_TOOLS=ON + -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON + ) + qt6-build_src_configure } diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index ca27923c277e..8a4abb2947a4 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -272,6 +272,12 @@ src_configure() { $(qt_feature sqlite system_sqlite) ) + tc-is-cross-compiler && mycmakeargs+=( + -DQT_HOST_PATH="${BROOT}"/usr + -DQT_FORCE_BUILD_TOOLS=ON + -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON + ) + qt6-build_src_configure }