Skip to contentSkip to conversation

meson: fix device module builds

PATCH Superseded Gerd Hoffmann 2 participants 4 messages Sep 7, 2020 Arm/Amlogic Meson SoC support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover meson: fix device module builds

Gerd Hoffmann (2):
meson: fix module config
meson: remove duplicate qxl sources

 hw/display/meson.build | 2 --
 meson.build            | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/2 meson: fix module config

Use all config symbols not only the host ones. Needed to make sure device configs like CONFIG_QXL are used for modules too.

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
index 5aaa3647305d..837061cdfff6 100644
@@ -844,7 +844,7 @@ softmmu_mods = []
 foreach d, list : modules
   foreach m, module_ss : list
     if enable_modules and targetos != 'windows'
-      module_ss = module_ss.apply(config_host, strict: false)
+      module_ss = module_ss.apply(config_all, strict: false)
       sl = static_library(d + '-' + m, [genh, module_ss.sources()],
                           dependencies: [modulecommon, module_ss.dependencies()], pic: true)
       if d == 'block'
Signature · 1 line
2.27.0
#2 lore raw

PATCH 2/2 meson: remove duplicate qxl sources

In reply to Gerd Hoffmann

We should add sources to the softmmu_ss or module_ss but not both.

---
 hw/display/meson.build | 2 --
 1 file changed, 2 deletions(-)
hw/display/meson.build +0 -2
index 78adaf9db463..ef8eb093acbb 100644
@@ -45,8 +45,6 @@ if config_all_devices.has_key('CONFIG_QXL')
   hw_display_modules += {'qxl': qxl_ss}
 endif
 
-softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
-
 softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
 softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
 
Signature · 1 line
2.27.0
Reviewed-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] meson: remove duplicate qxl sources

Quoted 12 lines · Gerd Hoffmann

We should add sources to the softmmu_ss or module_ss but not both.

---
 hw/display/meson.build | 2 --
 1 file changed, 2 deletions(-)
hw/display/meson.build +0 -0
index 78adaf9db463..ef8eb093acbb 100644

hw/display/meson.build if config_all_devices.has_key('CONFIG_QXL') · line 50

Quoted 8 lines
hw/display/meson.build +0 -2
@@ -45,8 +45,6 @@ if config_all_devices.has_key('CONFIG_QXL')
   hw_display_modules += {'qxl': qxl_ss}
 endif
 
-softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
-
 softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
 softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))