* [PATCH v2] meson.build: Allow to disable OSS again
@ 2021-11-02 10:58 Thomas Huth
2021-11-02 11:16 ` Paolo Bonzini
2021-11-02 11:55 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2021-11-02 10:58 UTC (permalink / raw)
To: qemu-devel, Paolo Bonzini; +Cc: Philippe Mathieu-Daudé
If sys/soundcard.h is available, it is currently not possible to
disable OSS with the --disable-oss or --without-default-features
configure switches. Improve the check in meson.build to fix this.
Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
v2: Only ever look for OSS if we also have system emulation enabled
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 6dec5dd5cc..2848917602 100644
--- a/meson.build
+++ b/meson.build
@@ -915,7 +915,7 @@ if liblzfse.found() and not cc.links('''
endif
oss = not_found
-if not get_option('oss').auto() or have_system
+if have_system and not get_option('oss').disabled()
if not cc.has_header('sys/soundcard.h')
# not found
elif targetos == 'netbsd'
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] meson.build: Allow to disable OSS again
2021-11-02 10:58 [PATCH v2] meson.build: Allow to disable OSS again Thomas Huth
@ 2021-11-02 11:16 ` Paolo Bonzini
2021-11-02 11:55 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2021-11-02 11:16 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: Philippe Mathieu-Daudé
On 02/11/21 11:58, Thomas Huth wrote:
> If sys/soundcard.h is available, it is currently not possible to
> disable OSS with the --disable-oss or --without-default-features
> configure switches. Improve the check in meson.build to fix this.
>
> Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> v2: Only ever look for OSS if we also have system emulation enabled
>
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 6dec5dd5cc..2848917602 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -915,7 +915,7 @@ if liblzfse.found() and not cc.links('''
> endif
>
> oss = not_found
> -if not get_option('oss').auto() or have_system
> +if have_system and not get_option('oss').disabled()
> if not cc.has_header('sys/soundcard.h')
> # not found
> elif targetos == 'netbsd'
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] meson.build: Allow to disable OSS again
2021-11-02 10:58 [PATCH v2] meson.build: Allow to disable OSS again Thomas Huth
2021-11-02 11:16 ` Paolo Bonzini
@ 2021-11-02 11:55 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-11-02 11:55 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Paolo Bonzini
On 11/2/21 11:58, Thomas Huth wrote:
> If sys/soundcard.h is available, it is currently not possible to
> disable OSS with the --disable-oss or --without-default-features
> configure switches. Improve the check in meson.build to fix this.
>
> Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> v2: Only ever look for OSS if we also have system emulation enabled
>
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-02 12:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-02 10:58 [PATCH v2] meson.build: Allow to disable OSS again Thomas Huth
2021-11-02 11:16 ` Paolo Bonzini
2021-11-02 11:55 ` Philippe Mathieu-Daudé
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).