[PATCH] meson: remove linkage of sdl to baum

[PATCH] meson: remove linkage of sdl to baum

[Bruce Rogers]

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
 
-- 
2.28.0

Re: [PATCH] meson: remove linkage of sdl to baum

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]

Hi

On Thu, Sep 3, 2020 at 7:33 PM Bruce Rogers <brogers@suse.com> 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>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.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
>
> --
> 2.28.0
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 2265 bytes --]

Re: [PATCH] meson: remove linkage of sdl to baum

[Paolo Bonzini]

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