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

fix internal python deps on MacOSX

Browse Source 
This means we can put python3 back into tail_build, IMO.

Change-Id: I38b43f8fb0a0f91c42acb5acb3066b1e8596ceea
This commit is contained in:
David Tardon
2012-12-29 10:07:07 +01:00
parent bbf2f41395
commit 2e6d024ac5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RepositoryExternal.mk
View File

@@ -2521,7 +2521,10 @@ define gb_ExternalExecutable__register_python
$(call gb_ExternalExecutable_set_internal,python) $(call gb_ExternalExecutable_set_internal,python)
$(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) $(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND))
$(call gb_ExternalExecutable_add_dependencies,python,\ $(call gb_ExternalExecutable_add_dependencies,python,\
$(call gb_Package_get_target,python3) \ $(if $(filter MACOSX,$(OS)) \
,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework) \
,$(call gb_Package_get_target_for_build,python3) \
) \
) )
endef endef

1
solenv/gbuild/TargetLocations.mk
View File

@@ -60,6 +60,7 @@ gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb
gb_UnoApiMerge_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1).rdb gb_UnoApiMerge_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1).rdb
gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
gb_Zip_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/pck/$(1).zip
# outdir targets: $(1) is path # outdir targets: $(1) is path
gb_Configuration_registry = $(OUTDIR)/xml/registry gb_Configuration_registry = $(OUTDIR)/xml/registry
gb_XcsTarget_get_outdir_target = \ gb_XcsTarget_get_outdir_target = \