[Libreoffice-commits] core.git: RepositoryExternal.mk

[Christian Lohmaier]

 RepositoryExternal.mk |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 04032bd6062638f6945e3911a491fa311404c507
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Mar 19 17:27:01 2013 +0100

    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 at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a7042b1..2d1d75d 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