commit: a631496f102c4b1dbc40e643eccb7f477fd24e53 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Feb 20 22:37:13 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> 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 <chewi <AT> 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 }
