diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-03-02 11:54:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-03-03 10:42:09 +0100 |
| commit | d257314af28c3e956757c0856490ba70104dfcc0 (patch) | |
| tree | 373fb21213795830d381e29fdf5b15fd325d8c7d /sw/CustomTarget_generated.mk | |
| parent | 0d4aa17ee7b6a02100dc2b10c328dc6be4f184cf (diff) | |
Fix call of Python
...where $(PYTHON) is undefined, but which was mostly masked by
solenv/bin/gentoken.py happening to have a shebang line, except for flatpak
builds now failing with
> /usr/bin/env: ‘python’: No such file or directory
> make[1]: *** [/run/build/libreoffice/editeng/CustomTarget_generated.mk:18: /run/build/libreoffice/workdir/CustomTarget/editeng/generated/tokens.gperf] Error 127
(See also discussion in the comments of
<https://gerrit.libreoffice.org/c/core/+/89262> "Convert gentoken from Perl to
Python.")
Change-Id: Iebdf98d7b7ee4da9d861231064549ffef5445edc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89828
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/CustomTarget_generated.mk')
| -rw-r--r-- | sw/CustomTarget_generated.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk index fb3f842d382a..80a1c1642ea9 100644 --- a/sw/CustomTarget_generated.mk +++ b/sw/CustomTarget_generated.mk @@ -16,12 +16,12 @@ sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated) $(sw_INC)/TextBlockTokens.gperf : $(sw_SRC)/TextBlockTokens.txt $(sw_PY) \ $(call gb_ExternalExecutable_get_dependencies,python) mkdir -p $(sw_INC) - $(PYTHON) $(sw_PY) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf + $(call gb_ExternalExecutable_get_command,python) $(sw_PY) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens.gperf : $(sw_SRC)/BlockListTokens.txt $(sw_PY) \ $(call gb_ExternalExecutable_get_dependencies,python) mkdir -p $(sw_INC) - $(PYTHON) $(sw_PY) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf + $(call gb_ExternalExecutable_get_command,python) $(sw_PY) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf $(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens.gperf $(GPERF) --compare-strncmp --readonly-tables --output-file=$(sw_INC)/tokens.cxx \ |