[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 46/46] meson: remove linkage of sdl to baum
From: |
Paolo Bonzini |
Subject: |
[PULL 46/46] meson: remove linkage of sdl to baum |
Date: |
Fri, 4 Sep 2020 07:41:22 -0400 |
From: Bruce Rogers <brogers@suse.com>
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>
Message-Id: <20200903152933.97838-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@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.26.2
- [PULL 35/46] configure: remove unnecessary libm test, (continued)
- [PULL 35/46] configure: remove unnecessary libm test, Paolo Bonzini, 2020/09/04
- [PULL 40/46] docs: suggest Meson replacements for various configure functions, Paolo Bonzini, 2020/09/04
- [PULL 41/46] configure: update dtc submodule, Paolo Bonzini, 2020/09/04
- [PULL 34/46] configure: move -ldl test to meson, Paolo Bonzini, 2020/09/04
- [PULL 37/46] meson: get glib compilation flags from GLIB_CFLAGS, Paolo Bonzini, 2020/09/04
- [PULL 30/46] Makefile: inline the relevant parts of rules.mak, Paolo Bonzini, 2020/09/04
- [PULL 36/46] configure: do not look for install(1), Paolo Bonzini, 2020/09/04
- [PULL 39/46] configure: drop dead variables and functions, Paolo Bonzini, 2020/09/04
- [PULL 38/46] configure: do not include dependency flags in QEMU_CFLAGS and LIBS, Paolo Bonzini, 2020/09/04
- [PULL 43/46] meson: specify fuzz linker script as a project arg, Paolo Bonzini, 2020/09/04
- [PULL 46/46] meson: remove linkage of sdl to baum,
Paolo Bonzini <=
- [PULL 44/46] fuzz: Add support for custom fuzzing library, Paolo Bonzini, 2020/09/04
- [PULL 45/46] meson: Convert undefsym.sh to undefsym.py, Paolo Bonzini, 2020/09/04
- [PULL 42/46] oss-fuzz: fix rpath, Paolo Bonzini, 2020/09/04
- Re: [PULL 00/46] Next round of Meson bugfixes and cleanups, Peter Maydell, 2020/09/06