external/meson/ExternalProject_meson.mk | 16 ++++++++++++++++ external/meson/Module_meson.mk | 1 + 2 files changed, 17 insertions(+)
New commits: commit 983b1a6dddc6eb108f9af660b6ffa5c7bedd1f55 Author: Andras Timar <[email protected]> AuthorDate: Fri Oct 31 14:59:45 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Fri Oct 31 18:29:07 2025 +0100 build internal python before trying to use meson Change-Id: Idb27a3e6c27640528488df263b93809221b09f1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193270 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/external/meson/ExternalProject_meson.mk b/external/meson/ExternalProject_meson.mk new file mode 100644 index 000000000000..77f7fedf056e --- /dev/null +++ b/external/meson/ExternalProject_meson.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,meson)) + +ifeq ($(SYSTEM_PYTHON),) +$(WORKDIR)/ExternalProject/meson.prepare : $(call gb_Package_get_target,python3) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/meson/Module_meson.mk b/external/meson/Module_meson.mk index 98bbec043764..acab213940fc 100644 --- a/external/meson/Module_meson.mk +++ b/external/meson/Module_meson.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,meson)) $(eval $(call gb_Module_add_targets,meson,\ + ExternalProject_meson \ UnpackedTarball_meson \ ))
