mirror of
https://github.com/termux/termux-packages.git
synced 2025-08-05 03:40:35 +00:00
bfe26bb00e
- Fixes https://github.com/termux/termux-packages/issues/24975
Fixes the build in `TERMUX_ON_DEVICE_BUILD=true` mode of reverse dependencies of qt6 like `tageditor`,
where `CMAKE_HOST_SYSTEM_NAME` is "`Android`" and the path `$TERMUX_PREFIX/opt/qt6/cross` should never be
used because it contains GNU/Linux binaries that are sent there by the automatic installation
of `qt6-*-cross-tools packages` during `termux_step_get_dependencies()` by `scripts/buildorder.py`
installing the `qt6-*-cross-tools` subpackages of `qt6-*` packages during the builds of reverse dependencies
of qt6,
da3717f439/scripts/buildorder.py (L159)
without breaking the builds of anything in `TERMUX_ON_DEVICE_BUILD=false` mode,
where `CMAKE_HOST_SYSTEM_NAME` is "`Linux`" so the paths set by
"`-DQT_HOST_PATH=${TERMUX_PREFIX}/opt/qt6/cross`" in `TERMUX_PKG_EXTRA_CONFIGURE_ARGS` of `qt6-qtbase`
are used here instead.
The patch `do-not-use-cross-tools-paths-ondevice-for-reverse-deps.patch` fixes only the `moc: 1: ELF: not found` part of the error message,
and the changes to the use of `-DQt6LinguistTools_DIR` fix the `lupdate: 1: Syntax error: word unexpected (expecting ")")` part of the error message.