motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: compute config_all_devices directly

Browse source 
There is no need anymore to produce config-all-devices.mak, compute
the resulting dictionary directly instead of going through grepy.sh.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-09-01 05:32:23 -04:00
parent 0f4d8894df
commit a98006bc79
3 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,7 +2,6 @@
/build/ /build/
/.doctrees /.doctrees
/config-devices.* /config-devices.*
/config-all-devices.*
/config-all-disas.* /config-all-disas.*
/config-host.* /config-host.*
/config-target.* /config-target.*

14
meson.build
View file

@ -460,6 +460,7 @@ endforeach
genh += configure_file(output: 'config-host.h', configuration: config_host_data) genh += configure_file(output: 'config-host.h', configuration: config_host_data)
minikconf = find_program('scripts/minikconf.py') minikconf = find_program('scripts/minikconf.py')
config_all_devices = {}
config_devices_mak_list = [] config_devices_mak_list = []
config_devices_h = {} config_devices_h = {}
config_target_h = {} config_target_h = {}
@ -528,11 +529,11 @@ foreach target : target_dirs
config_devices_h += {target: configure_file(output: target + '-config-devices.h', config_devices_h += {target: configure_file(output: target + '-config-devices.h',
configuration: config_devices_data)} configuration: config_devices_data)}
config_target += config_devices config_target += config_devices
config_all_devices += config_devices
endif endif
config_target_mak += {target: config_target} config_target_mak += {target: config_target}
endforeach endforeach
grepy = find_program('scripts/grepy.sh')
# This configuration is used to build files that are shared by # This configuration is used to build files that are shared by
# multiple binaries, and then extracted out of the "common" # multiple binaries, and then extracted out of the "common"
# static_library target. # static_library target.
@ -542,17 +543,6 @@ grepy = find_program('scripts/grepy.sh')
# targets that are not built for this compilation. The CONFIG_ALL # targets that are not built for this compilation. The CONFIG_ALL
# pseudo symbol replaces it. # pseudo symbol replaces it.
if have_system
config_all_devices_mak = configure_file(
output: 'config-all-devices.mak',
input: config_devices_mak_list,
capture: true,
command: [grepy, '@INPUT@'],
)
config_all_devices = keyval.load(config_all_devices_mak)
else
config_all_devices = {}
endif
config_all = config_all_devices config_all = config_all_devices
config_all += config_host config_all += config_host
config_all += config_all_disas config_all += config_all_disas

3
scripts/grepy.sh
View file

@ -1,3 +0,0 @@
#!/bin/sh
grep -h '=y$' "$@" | sort -u