diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-03-19 17:27:01 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-03-20 09:30:40 +0000 |
| commit | 04032bd6062638f6945e3911a491fa311404c507 (patch) | |
| tree | 5623d43260e69a9f9cbc84bbdeaebe5bbc464fd7 /RepositoryExternal.mk | |
| parent | fdo#55814 create unit test for it first (diff) | |
| download | core-04032bd6062638f6945e3911a491fa311404c507.tar.gz core-04032bd6062638f6945e3911a491fa311404c507.zip | |
allow to use internal python for build-stuff on Mac
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>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a7042b127d96..2d1d75d13eee 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -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 |