File 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch of Package libreoffice.8029
From 5c4c83dd7ee9145408d80dbac606547c8006ad2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com> Date: Tue, 13 Feb 2018 10:57:54 +0100 Subject: [PATCH] Use PYTHON_FOR_BUILD instead of calling python directly Change-Id: I85ff669c3cfd6d9b3284972cfa1d8a805ea3b6d4 --- postprocess/CustomTarget_images.mk | 2 +- testtools/source/bridgetest/pyuno/makefile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 603c73d522d4..871c7bd6470c 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -33,7 +33,7 @@ $(packimages_DIR)/%.zip : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ - $(PYTHON) $(SRCDIR)/solenv/bin/pack_images.py \ + $(PYTHON_FOR_BUILD) $(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_,,$*) \ diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index 5dbd0038f009..112be23c9ce8 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -46,7 +46,7 @@ REGEXC=$(DLLDEST)$/regcomp$(EXECPOST) .IF "$(SYSTEM_PYTHON)"!="YES" PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python .ELSE # "$(SYSTEM_PYTHON)"!="YES" -PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python +PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(PYTHON_FOR_BUILD) .ENDIF # "$(SYSTEM_PYTHON)"!="YES" .IF "$(OS)"=="WNT" PYTHONPATH:=$(SOLARLIBDIR)$/pyuno;$(PWD);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload -- 2.16.1
