qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: Re: [PATCH v2] meson.build: Allow to disable OSS again
Date: Tue, 2 Nov 2021 12:16:24 +0100	[thread overview]
Message-ID: <7ec62eaf-d8e6-a27c-d6cd-64d09d17cb58@redhat.com> (raw)
In-Reply-To: <20211102105822.773131-1-thuth@redhat.com>

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



  reply	other threads:[~2021-11-02 12:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-02 10:58 [PATCH v2] meson.build: Allow to disable OSS again Thomas Huth
2021-11-02 11:16 ` Paolo Bonzini [this message]
2021-11-02 11:55 ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7ec62eaf-d8e6-a27c-d6cd-64d09d17cb58@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).