qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Bruce Rogers <brogers@suse.com>, qemu-devel@nongnu.org
Cc: samuel.thibault@ens-lyon.org, f4bug@amsat.org
Subject: Re: [PATCH] meson: remove linkage of sdl to baum
Date: Thu, 3 Sep 2020 20:04:01 +0200	[thread overview]
Message-ID: <c5a33e9f-1831-627d-6294-12c1ca9a4389@redhat.com> (raw)
In-Reply-To: <20200903152933.97838-1-brogers@suse.com>

On 03/09/20 17:29, Bruce Rogers wrote:
> Ever since commit 537fe2d63f744e7c96ff45b60d09486a81958e06 there
> has been a 'linkage' to sdl for compiling baum.c. Originally it
> had to do with including sdl cflags for any file including sdl
> headers. There is no longer any such need for baum.c, but the
> association has persisted in the make system, and with the switch
> to meson it has now become a hard requirement, which now causes
> chardev-baum.so to not be produced if sdl is not configured.
> Remove this bogus linkage.
> 
> Signed-off-by: Bruce Rogers <brogers@suse.com>
> ---
>  chardev/meson.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/chardev/meson.build b/chardev/meson.build
> index 27a9a28f4c..54e88d0310 100644
> --- a/chardev/meson.build
> +++ b/chardev/meson.build
> @@ -36,9 +36,9 @@ softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c'))
>  
>  chardev_modules = {}
>  
> -if config_host.has_key('CONFIG_BRLAPI') and sdl.found()
> +if config_host.has_key('CONFIG_BRLAPI')
>    module_ss = ss.source_set()
> -  module_ss.add(when: [sdl, brlapi], if_true: [files('baum.c'), pixman])
> +  module_ss.add(when: [brlapi], if_true: [files('baum.c'), pixman])
>    chardev_modules += { 'baum': module_ss }
>  endif
>  
> 

Queued, thanks.

Paolo



      parent reply	other threads:[~2020-09-03 18:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-03 15:29 [PATCH] meson: remove linkage of sdl to baum Bruce Rogers
2020-09-03 15:45 ` Marc-André Lureau
2020-09-03 18:04 ` Paolo Bonzini [this message]

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=c5a33e9f-1831-627d-6294-12c1ca9a4389@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=brogers@suse.com \
    --cc=f4bug@amsat.org \
    --cc=qemu-devel@nongnu.org \
    --cc=samuel.thibault@ens-lyon.org \
    /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).