From e8c90926bddec034bfdb753044c001aa90e4d1f8 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Wed, 30 Jun 2021 19:22:35 +0300 Subject: [PATCH] doc: fix build on Windows with Meson 0.58 The `doc` target used `echo` as its command. On Windows, `echo` is always a shell built-in, there is no binary. Starting from meson 0.58, `run_target()` always searches for command executable and no longer accepts `echo` as such on Windows. Replace plain `echo` with a Python one-liner. Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson") Cc: stable@dpdk.org Reported-by: Rob Scheepens Signed-off-by: Dmitry Kozlyuk Acked-by: Luca Boccassi Acked-by: Bruce Richardson Acked-by: Thomas Monjalon --- buildtools/meson.build | 2 +- doc/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/meson.build b/buildtools/meson.build index 0f24b15297..bd460e3e00 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -6,13 +6,13 @@ check_symbols = find_program('check-symbols.sh') ldflags_ibverbs_static = find_program('options-ibverbs-static.sh') binutils_avx512_check = find_program('binutils-avx512-check.sh') -# set up map-to-win script using python, either built-in or external python3 = import('python').find_installation(required: false) if python3.found() py3 = [python3] else py3 = ['meson', 'runpython'] endif +echo = py3 + ['-c', 'import sys; print(*sys.argv[1:])'] list_dir_globs = py3 + files('list-dir-globs.py') map_to_win_cmd = py3 + files('map_to_win.py') sphinx_wrapper = py3 + files('call-sphinx-build.py') diff --git a/doc/meson.build b/doc/meson.build index 959606b965..6f74706aa2 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -11,5 +11,5 @@ if doc_targets.length() == 0 else message = 'Building docs:' endif -run_target('doc', command: ['echo', message, doc_target_names], +run_target('doc', command: [echo, message, doc_target_names], depends: doc_targets) -- 2.20.1