mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: convert dump/

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-09-03 16:59:33 +04:00 committed by Paolo Bonzini
parent 0e1309d0c5
commit 708eab42dc
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.objs
View File

@ -48,8 +48,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
# single QEMU executable should support all CPUs and machines.
ifeq ($(CONFIG_SOFTMMU),y)
common-obj-y = dump/
common-obj-y += monitor/
common-obj-y = monitor/
common-obj-y += net/
common-obj-$(CONFIG_LINUX) += fsdev/

1
Makefile.target
View File

@ -156,7 +156,6 @@ endif #CONFIG_BSD_USER
ifdef CONFIG_SOFTMMU
obj-y += softmmu/
obj-y += gdbstub.o
obj-y += dump/
obj-y += hw/
obj-y += monitor/
obj-y += qapi/

4
configure vendored
View File

@ -2620,6 +2620,7 @@ int main(void) { lzo_version(); return 0; }
EOF
if compile_prog "" "-llzo2" ; then
libs_softmmu="$libs_softmmu -llzo2"
lzo_libs="-llzo2"
lzo="yes"
else
if test "$lzo" = "yes"; then
@ -2639,6 +2640,7 @@ int main(void) { snappy_max_compressed_length(4096); return 0; }
EOF
if compile_prog "" "-lsnappy" ; then
libs_softmmu="$libs_softmmu -lsnappy"
snappy_libs='-lsnappy'
snappy="yes"
else
if test "$snappy" = "yes"; then
@ -7468,10 +7470,12 @@ fi
if test "$lzo" = "yes" ; then
echo "CONFIG_LZO=y" >> $config_host_mak
echo "LZO_LIBS=$lzo_libs" >> $config_host_mak
fi
if test "$snappy" = "yes" ; then
echo "CONFIG_SNAPPY=y" >> $config_host_mak
echo "SNAPPY_LIBS=$snappy_libs" >> $config_host_mak
fi
if test "$bzip2" = "yes" ; then

3
dump/Makefile.objs
View File

@ -1,3 +0,0 @@
obj-y += dump.o
common-obj-y += dump-hmp-cmds.o
obj-$(TARGET_X86_64) += win_dump.o

4
dump/meson.build Normal file
View File

@ -0,0 +1,4 @@
softmmu_ss.add(files('dump-hmp-cmds.c'))
specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('dump.c'), snappy, lzo])
specific_ss.add(when: ['CONFIG_SOFTMMU', 'TARGET_X86_64'], if_true: files('win_dump.c'))

9
meson.build
View File

@ -300,6 +300,14 @@ if 'CONFIG_FDT' in config_host
fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(),
link_args: config_host['FDT_LIBS'].split())
endif
snappy = not_found
if 'CONFIG_SNAPPY' in config_host
snappy = declare_dependency(link_args: config_host['SNAPPY_LIBS'].split())
endif
lzo = not_found
if 'CONFIG_LZO' in config_host
lzo = declare_dependency(link_args: config_host['LZO_LIBS'].split())
endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@ -607,6 +615,7 @@ subdir('io')
subdir('chardev')
subdir('fsdev')
subdir('target')
subdir('dump')
block_ss.add(files(
'block.c',