patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] doc: fix build on Windows with meson 0.58
@ 2021-06-30 16:15 Dmitry Kozlyuk
  2021-07-01  9:23 ` Richardson, Bruce
  0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Kozlyuk @ 2021-06-30 16:15 UTC (permalink / raw)
  To: stable; +Cc: Dmitry Kozlyuk, Bruce Richardson, Luca Boccassi, Rob Scheepens

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: Bruce Richardson <bruce.richardson@intel.com>
Cc: Luca Boccassi <bluca@debian.org>
Cc: stable@dpdk.org

Reported-by: Rob Scheepens <rob.scheepens@nutanix.com>
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 doc/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/meson.build b/doc/meson.build
index 959606b965..abd7d70421 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -11,5 +11,6 @@ if doc_targets.length() == 0
 else
     message = 'Building docs:'
 endif
-run_target('doc', command: ['echo', message, doc_target_names],
+echo = [py3, '-c', 'import sys; print(*sys.argv[1:])']
+run_target('doc', command: [echo, message, doc_target_names],
     depends: doc_targets)
-- 
2.29.3


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [PATCH] doc: fix build on Windows with meson 0.58
  2021-06-30 16:15 [dpdk-stable] [PATCH] doc: fix build on Windows with meson 0.58 Dmitry Kozlyuk
@ 2021-07-01  9:23 ` Richardson, Bruce
  0 siblings, 0 replies; 2+ messages in thread
From: Richardson, Bruce @ 2021-07-01  9:23 UTC (permalink / raw)
  To: Dmitry Kozlyuk, stable; +Cc: Luca Boccassi, Rob Scheepens



> -----Original Message-----
> From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Sent: Wednesday, June 30, 2021 5:15 PM
> To: stable@dpdk.org
> Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Luca Boccassi <bluca@debian.org>; Rob
> Scheepens <rob.scheepens@nutanix.com>
> 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: Bruce Richardson <bruce.richardson@intel.com>
> Cc: Luca Boccassi <bluca@debian.org>
> Cc: stable@dpdk.org
> 
> Reported-by: Rob Scheepens <rob.scheepens@nutanix.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
>  doc/meson.build | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/meson.build b/doc/meson.build
> index 959606b965..abd7d70421 100644
> --- a/doc/meson.build
> +++ b/doc/meson.build
> @@ -11,5 +11,6 @@ if doc_targets.length() == 0
>  else
>      message = 'Building docs:'
>  endif
> -run_target('doc', command: ['echo', message, doc_target_names],
> +echo = [py3, '-c', 'import sys; print(*sys.argv[1:])']
> +run_target('doc', command: [echo, message, doc_target_names],
>      depends: doc_targets)
> --
> 2.29.3

LGTM
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-01  9:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-30 16:15 [dpdk-stable] [PATCH] doc: fix build on Windows with meson 0.58 Dmitry Kozlyuk
2021-07-01  9:23 ` Richardson, Bruce

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).