ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#168848 fix cairo build with --enable-python=fully-internal on linux

Browse Source 
Change-Id: I1abc8a3c9a7378d8a5d8d9917ae53b8405677e3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193262
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Andras Timar
2025-10-31 18:28:08 +01:00
parent ea2ecf0406
commit 567466b473
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RepositoryExternal.mk
+1 -1
View File
@@ -4176,7 +4176,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_
else
$(call gb_ExternalExecutable_set_internal,python,$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
$(call gb_ExternalExecutable_set_internal,python,$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python))
$(call gb_ExternalExecutable_set_precommand,python,$(subst $$,$$$$,$(gb_Python_PRECOMMAND)))
$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3))
external/cairo/UnpackedTarball_cairo.mk
Vendored
+7
View File
@@ -41,4 +41,11 @@ ifneq (,$(filter MACOSX ANDROID iOS,$(OS)))
$(eval $(call gb_UnpackedTarball_add_file,cairo,.,external/cairo/cairo/dummy_pkg_config))
endif
# meson will replace python3 from shebang in build commands with the
# interpreter it is run with (which is what we want for python=fully-internal
# case to avoid incompatibilities with the system python version).
# And while it does so unconditionally on windows, on other platforms that only
# happens if the command to run doesn't have the executable bit set.
$(eval $(call gb_UnpackedTarball_set_post_action,cairo,chmod a-x version.py))
# vim: set noet sw=4 ts=4: