diff mbox series

[7/9] meson: Do not configure audio if system-mode is not selected

Message ID 20210119185005.880322-8-philmd@redhat.com (mailing list archive)
State New, archived
Headers show
Series meson: Clarify summary | expand

Commit Message

Philippe Mathieu-Daudé Jan. 19, 2021, 6:50 p.m. UTC
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 configure   | 6 ++++++
 meson.build | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé Jan. 19, 2021, 6:53 p.m. UTC | #1
Forgot to Cc Gerd, adding him.

On 1/19/21 7:50 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  configure   | 6 ++++++
>  meson.build | 4 +++-
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 9f016b06b54..a15bdfb6ef3 100755
> --- a/configure
> +++ b/configure
> @@ -2324,6 +2324,12 @@ if test -z "$want_tools"; then
>      fi
>  fi
>  
> +##########################################
> +# Disable features only meaningful for system-mode emulation
> +if test "$softmmu" = "no"; then
> +    audio_drv_list=""
> +fi
> +
>  ##########################################
>  # Some versions of Mac OS X incorrectly define SIZE_MAX
>  cat > $TMPC << EOF
> diff --git a/meson.build b/meson.build
> index 575e34d88ac..e6c6d1518ef 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2425,7 +2425,9 @@
>  # TODO: add back version
>  summary_info += {'virgl support':     config_host.has_key('CONFIG_VIRGL')}
>  summary_info += {'curl support':      curl.found()}
> -summary_info += {'Audio drivers':     config_host['CONFIG_AUDIO_DRIVERS']}
> +if have_system
> +  summary_info += {'Audio drivers':     config_host['CONFIG_AUDIO_DRIVERS']}
> +endif
>  summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
>  summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
>  summary_info += {'VirtFS support':    have_virtfs}
>
Gerd Hoffmann Jan. 20, 2021, 9:09 a.m. UTC | #2
> > +##########################################
> > +# Disable features only meaningful for system-mode emulation
> > +if test "$softmmu" = "no"; then
> > +    audio_drv_list=""
> > +fi
> > +

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

> >  ##########################################
> >  # Some versions of Mac OS X incorrectly define SIZE_MAX
> >  cat > $TMPC << EOF
> > diff --git a/meson.build b/meson.build
> > index 575e34d88ac..e6c6d1518ef 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -2425,7 +2425,9 @@
> >  # TODO: add back version
> >  summary_info += {'virgl support':     config_host.has_key('CONFIG_VIRGL')}
> >  summary_info += {'curl support':      curl.found()}
> > -summary_info += {'Audio drivers':     config_host['CONFIG_AUDIO_DRIVERS']}
> > +if have_system
> > +  summary_info += {'Audio drivers':     config_host['CONFIG_AUDIO_DRIVERS']}
> > +endif

I guess there are alot more cfg options like that one.  virgl support
for starters ;)

So maybe group them in a block?

take care,
  Gerd
diff mbox series

Patch

diff --git a/configure b/configure
index 9f016b06b54..a15bdfb6ef3 100755
--- a/configure
+++ b/configure
@@ -2324,6 +2324,12 @@  if test -z "$want_tools"; then
     fi
 fi
 
+##########################################
+# Disable features only meaningful for system-mode emulation
+if test "$softmmu" = "no"; then
+    audio_drv_list=""
+fi
+
 ##########################################
 # Some versions of Mac OS X incorrectly define SIZE_MAX
 cat > $TMPC << EOF
diff --git a/meson.build b/meson.build
index 575e34d88ac..e6c6d1518ef 100644
--- a/meson.build
+++ b/meson.build
@@ -2425,7 +2425,9 @@ 
 # TODO: add back version
 summary_info += {'virgl support':     config_host.has_key('CONFIG_VIRGL')}
 summary_info += {'curl support':      curl.found()}
-summary_info += {'Audio drivers':     config_host['CONFIG_AUDIO_DRIVERS']}
+if have_system
+  summary_info += {'Audio drivers':     config_host['CONFIG_AUDIO_DRIVERS']}
+endif
 summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
 summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
 summary_info += {'VirtFS support':    have_virtfs}