mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow to use internal python for build-stuff on Mac

Browse Source 
Mac builds python as framework, so bundling is quite different from
other systems. Use the set_external variant to avoid adding a
non-resolvable prerequisite to the targets that are built using python.

Change-Id: I1c6f2b61a3ff99f8ccbc4e0b5d88145940a4a8ef
Reviewed-on: https://gerrit.libreoffice.org/2849
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
This commit is contained in:
Christian Lohmaier
2013-03-19 17:27:01 +01:00
committed by Noel Power
parent 1bf65d1d57
commit 04032bd606
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
RepositoryExternal.mk
View File

@@ -2796,14 +2796,23 @@ endif # SYSTEM_UCPP
ifeq (,$(PYTHON_FOR_BUILD))
define gb_ExternalExecutable__register_python
ifeq ($(OS),MACOSX)
# use set_external, to avoid having the command added as prerequisite for the
# targets that make use of it. (Otherwise make will choke as it doesn't have a
# matching rule to build that specific file)
$(call gb_ExternalExecutable_set_external,python,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR))
# the Zip ensures that internal python has been built (cannot use the Package
# target, as that is not used on Mac)
$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework))
else
$(call gb_ExternalExecutable_set_internal,python)
$(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND))
$(call gb_ExternalExecutable_add_dependencies,python,\
$(if $(filter MACOSX,$(OS)) \
,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework) \
,$(call gb_Package_get_target_for_build,python3) \
) \
)
$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3))
endif
endef