Skip to contentSkip to conversation

meson: remove linkage of sdl to baum

PATCH Applied Bruce Rogers 3 participants 3 messages Sep 3, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: remove linkage of sdl to baum

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.

---
 chardev/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
chardev/meson.build +2 -2
index 27a9a28f4c..54e88d0310 100644
@@ -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
 
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw

Hi

Quoted 11 lines · 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.

---

Quoted 25 lines
 chardev/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
chardev/meson.build +2 -3
index 27a9a28f4c..54e88d0310 100644
@@ -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

Signature · 1 line
Marc-André Lureau
#2 lore raw
In reply to Bruce Rogers
Quoted 21 lines · 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.

---
 chardev/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
chardev/meson.build +0 -0
index 27a9a28f4c..54e88d0310 100644
@@ -36,9 +36,9 @@ softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c'))
 

chardev/meson.build softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) · line 44

Quoted 10 lines
chardev/meson.build +2 -2
 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