# HG changeset patch # User Markus Mützel # Date 1695983726 -7200 # Node ID 4f23ac562f624edf7503049fb74d57cfafff60ae # Parent a0e9deadb2215db7edda9c4b85b5d7dae5900b6f Qt6 QtBase: Use default CMake generator. * src/qt6-qtbase.mk: Ninja might not be installed on the build host. Use default CMake generator instead. Upstream recommends building with Ninja. Consider depending on build-ninja instead if this change causes issues. diff -r a0e9deadb221 -r 4f23ac562f62 src/qt6-qtbase.mk --- a/src/qt6-qtbase.mk Fri Sep 29 10:51:23 2023 +0200 +++ b/src/qt6-qtbase.mk Fri Sep 29 12:35:26 2023 +0200 @@ -73,7 +73,6 @@ if [ "$(MXE_NATIVE_BUILD)" = "no" ]; then \ mkdir '$(1).native'; \ cmake -S '$(1)' -B '$(1).native' \ - -G Ninja \ -DCMAKE_INSTALL_PREFIX='$(BUILD_TOOLS_PREFIX)/qt6' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \ -DQT_BUILD_{TESTS,EXAMPLES,DOCS}=OFF \ @@ -87,7 +86,6 @@ mkdir '$(1).build' $($(PKG)_CONFIGURE_ENV) \ 'cmake' -S '$(1)' -B '$(1).build' \ - -G Ninja \ $(CMAKE_CCACHE_FLAGS) \ -DCMAKE_INSTALL_PREFIX='$(HOST_PREFIX)/qt6' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ @@ -106,7 +104,7 @@ -DFEATURE_pkg_config=ON \ -DFEATURE_system_zlib=ON \ -DFEATURE_use_gold_linker_alias=OFF \ - $($(PKG)_CMAKE_OPTS) + $($(PKG)_CMAKE_OPTS) 'cmake' --build '$(1).build' -j '$(JOBS)' 'cmake' --install '$(1).build'