[PATCH 0/3] meson: Minor improvements

[PATCH 0/3] meson: Minor improvements

[Philippe Mathieu-Daudé]

Trivial meson improvements, mostly no logical changes,
improving summary display.

Philippe Mathieu-Daudé (3):
  meson: Only build virtfs-proxy-helper if all requisites are found
  meson: List if X11 dependency is detected
  meson: List modules built in summary

 meson.build | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

-- 
2.26.3

[PATCH 1/3] meson: Only build virtfs-proxy-helper if all requisites are found

[Philippe Mathieu-Daudé]

We first set have_virtfs_proxy_helper depending on have_virtfs,
then update have_virtfs... While this might work, it is not clear
when looking at the code logic. Move the have_virtfs_proxy_helper
assignation *after* updating have_virtfs to make it obvious.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 632b380738d..2a7d69cf428 100644
--- a/meson.build
+++ b/meson.build
@@ -1081,8 +1081,6 @@
     libattr.found() and
     libcap_ng.found())
 
-have_virtfs_proxy_helper = have_virtfs and have_tools
-
 if get_option('virtfs').enabled()
   if not have_virtfs
     if targetos != 'linux'
@@ -1097,6 +1095,8 @@
   have_virtfs = false
 endif
 
+have_virtfs_proxy_helper = have_virtfs and have_tools
+
 config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
 config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
 config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_confdir)
-- 
2.26.3

Re: [PATCH 1/3] meson: Only build virtfs-proxy-helper if all requisites are found

[Richard Henderson]

On 5/25/21 3:46 AM, Philippe Mathieu-Daudé wrote:
> We first set have_virtfs_proxy_helper depending on have_virtfs,
> then update have_virtfs... While this might work, it is not clear
> when looking at the code logic. Move the have_virtfs_proxy_helper
> assignation*after*  updating have_virtfs to make it obvious.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
>   meson.build | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

[PATCH 2/3] meson: List if X11 dependency is detected

[Philippe Mathieu-Daudé]

It is sometimes useful to know if X11 is detected.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index 2a7d69cf428..5ca1bd36292 100644
--- a/meson.build
+++ b/meson.build
@@ -2671,6 +2671,7 @@
 summary_info += {'SDL support':       sdl.found()}
 summary_info += {'SDL image support': sdl_image.found()}
 # TODO: add back version
+summary_info += {'X11 support':       x11.found()}
 summary_info += {'GTK support':       gtk.found()}
 summary_info += {'pixman':            pixman.found()}
 # TODO: add back version
-- 
2.26.3

Re: [PATCH 2/3] meson: List if X11 dependency is detected

[Richard Henderson]

On 5/25/21 3:46 AM, Philippe Mathieu-Daudé wrote:
> It is sometimes useful to know if X11 is detected.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
>   meson.build | 1 +
>   1 file changed, 1 insertion(+)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

[PATCH 3/3] meson: List modules built in summary

[Philippe Mathieu-Daudé]

Instead of guessing the modules built, list them. Example:

  Modules
    audio                        : spice
    block                        : curl dmg-bz2 gluster iscsi rbd ssh
    chardev                      : spice
    hw-display                   :
    hw-s390x                     : virtio-gpu-ccw
    hw-usb                       : redirect smartcard
    ui                           : egl-headless gtk opengl spice-app spice-core

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 meson.build | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/meson.build b/meson.build
index 5ca1bd36292..54b97ace207 100644
--- a/meson.build
+++ b/meson.build
@@ -2738,6 +2738,17 @@
 summary_info += {'FUSE lseek':        fuse_lseek.found()}
 summary(summary_info, bool_yn: true, section: 'Dependencies')
 
+# Modules
+summary_info = {}
+foreach d, list : modules
+  k = []
+    foreach m, _ : list
+      k += [m]
+    endforeach
+  summary_info += {d: ' '.join(k)}
+endforeach
+summary(summary_info, bool_yn: true, section: 'Modules')
+
 if not supported_cpus.contains(cpu)
   message()
   warning('SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!')
-- 
2.26.3

Re: [PATCH 3/3] meson: List modules built in summary

[Philippe Mathieu-Daudé]

On 5/25/21 12:46 PM, Philippe Mathieu-Daudé wrote:
> Instead of guessing the modules built, list them. Example:
> 
>   Modules
>     audio                        : spice
>     block                        : curl dmg-bz2 gluster iscsi rbd ssh
>     chardev                      : spice
>     hw-display                   :
>     hw-s390x                     : virtio-gpu-ccw
>     hw-usb                       : redirect smartcard
>     ui                           : egl-headless gtk opengl spice-app spice-core
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  meson.build | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/meson.build b/meson.build
> index 5ca1bd36292..54b97ace207 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2738,6 +2738,17 @@
>  summary_info += {'FUSE lseek':        fuse_lseek.found()}
>  summary(summary_info, bool_yn: true, section: 'Dependencies')
>  
> +# Modules
> +summary_info = {}
> +foreach d, list : modules
> +  k = []
> +    foreach m, _ : list
> +      k += [m]

Clearer renaming k -> mods, m -> mod and d -> k.

> +    endforeach
> +  summary_info += {d: ' '.join(k)}
> +endforeach
> +summary(summary_info, bool_yn: true, section: 'Modules')
> +
>  if not supported_cpus.contains(cpu)
>    message()
>    warning('SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!')
> 

Re: [PATCH 3/3] meson: List modules built in summary

[Paolo Bonzini]

On 25/05/21 12:46, Philippe Mathieu-Daudé wrote:
> +  k = []
> +    foreach m, _ : list
> +      k += [m]
> +    endforeach
> +  summary_info += {d: ' '.join(k)}

Perhaps:

foreach dir, list : modules
   if list.keys().length() > 0
     summary_info += {dir: ' '.join(list.keys())}
   endif
endforeach

Paolo

> +endforeach
> +summary(summary_info, bool_yn: true, section: 'Modules')
> +