diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-02-22 14:37:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-22 21:21:16 +0100 |
| commit | 906a2e4fa4e9ce231126c608e741c0c0d809157d (patch) | |
| tree | 71d5817a305074262caf5efc348436a6a0bdcc00 /postprocess | |
| parent | 50bf4eec6ff3cb3db23484331965f2e32cb0b5bc (diff) | |
Always execute pack_images.py with the right Python interpreter
With --enable-python=fully-internal, where PYTHON_FOR_BUILD is empty, this
executed the "#!/usr/bin/env python" shebang in pack_images.py, using whatever
python would be found (or not) on the system.
With this fixed, there is no need any more for pack_images.py to be executable.
Change-Id: I40ad3769898f3eb711dbe555d4c3faa9e3c1456d
Reviewed-on: https://gerrit.libreoffice.org/50180
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 871c7bd6470c..77c653abf3fe 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -29,11 +29,12 @@ $(packimages_DIR)/%.zip : \ $(packimages_DIR)/commandimagelist.ilst \ $(packimages_DIR)/sourceimagelist.ilst \ $(SRCDIR)/wizards/source/imagelists/imagelists.ilst \ - $(call gb_Helper_get_imagelists) + $(call gb_Helper_get_imagelists) \ + | $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ - $(PYTHON_FOR_BUILD) $(SRCDIR)/solenv/bin/pack_images.py \ + $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \ $(if $(DEFAULT_THEME),\ -g $(packimages_DIR) -m $(packimages_DIR) -c $(packimages_DIR),\ -g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \ |