RepositoryModule_build.mk | 1 + external/meson/ExternalProject_meson.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit ad36b8d03eca50feb40203c2e1b5b40d6c724c70 Author: Christian Lohmaier <[email protected]> AuthorDate: Tue Dec 2 11:14:15 2025 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Tue Dec 2 18:03:03 2025 +0100 fix cross-compilation to windows aarch64 and others where host binaries cannot be run by the builder. xmloff is part of the cross-toolset and that needs chart2api – and for make to know about the char2api library, it needs to load the chart2 module's makefiles. (since 1bd04a5413783608b15efe61d943c8f615b4ecec ) Change-Id: I3b5446313d3660fac553c003c0876bffe0690f05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194915 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 587e0454d9fd..c39b65cf937d 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ basegfx \ binaryurp \ bridges \ + chart2 \ cli_ure \ codemaker \ comphelper \ commit a54eab95fe2c3444f5c9eb32ebf675f509514117 Author: Christian Lohmaier <[email protected]> AuthorDate: Tue Dec 2 12:33:29 2025 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Tue Dec 2 18:02:49 2025 +0100 fix python dependency on meson solenv/gbuild/Package.mk:83: *** depend(s) on package python3 which does not exist.. Stop. It needs to depend on something that works with both internal and external python, namely the python executable/command. Change-Id: I4aee621ccc65261a1f7d4af7d1a303bd6d5f34d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194921 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/external/meson/ExternalProject_meson.mk b/external/meson/ExternalProject_meson.mk index 77f7fedf056e..f1b79de71f3a 100644 --- a/external/meson/ExternalProject_meson.mk +++ b/external/meson/ExternalProject_meson.mk @@ -10,7 +10,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,meson)) ifeq ($(SYSTEM_PYTHON),) -$(WORKDIR)/ExternalProject/meson.prepare : $(call gb_Package_get_target,python3) +$(WORKDIR)/ExternalProject/meson.prepare : $(call gb_ExternalExecutable_get_dependencies,python) endif # vim: set noet sw=4 ts=4:
