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 <[email protected]> > --- > 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
