[dpdk-stable] patch 'doc: fix build on Windows with Meson 0.58' has been queued to stable release 20.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/6cbeec965743bc4ae9906f78ea2d58e85dba0e98

Thanks.

Luca Boccassi

---
>From 6cbeec965743bc4ae9906f78ea2d58e85dba0e98 Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Date: Wed, 30 Jun 2021 19:22:35 +0300
Subject: [PATCH] doc: fix build on Windows with Meson 0.58

[ upstream commit e8c90926bddec034bfdb753044c001aa90e4d1f8 ]

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")

Reported-by: Rob Scheepens <rob.scheepens at nutanix.com>
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Acked-by: Luca Boccassi <bluca at debian.org>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
 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 36161afe48..cfad51f52a 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -7,13 +7,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 c5410d85d6..d6cf85a900 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.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:42.219484515 +0100
+++ 0108-doc-fix-build-on-Windows-with-Meson-0.58.patch	2021-07-12 13:41:36.914131443 +0100
@@ -1 +1 @@
-From e8c90926bddec034bfdb753044c001aa90e4d1f8 Mon Sep 17 00:00:00 2001
+From 6cbeec965743bc4ae9906f78ea2d58e85dba0e98 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e8c90926bddec034bfdb753044c001aa90e4d1f8 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index 0f24b15297..bd460e3e00 100644
+index 36161afe48..cfad51f52a 100644
@@ -29 +30 @@
-@@ -6,13 +6,13 @@ check_symbols = find_program('check-symbols.sh')
+@@ -7,13 +7,13 @@ check_symbols = find_program('check-symbols.sh')
@@ -36 +37 @@
-     py3 = [python3]
+ 	py3 = [python3]
@@ -38 +39 @@
-     py3 = ['meson', 'runpython']
+ 	py3 = ['meson', 'runpython']
@@ -45 +46 @@
-index 959606b965..6f74706aa2 100644
+index c5410d85d6..d6cf85a900 100644
@@ -50 +51 @@
-     message = 'Building docs:'
+ 	message = 'Building docs:'
@@ -54 +55 @@
-     depends: doc_targets)
+ 	depends: doc_targets)