meson: convert dump/
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
0e1309d0c5
commit
708eab42dc
|
@ -48,8 +48,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
|
||||||
# single QEMU executable should support all CPUs and machines.
|
# single QEMU executable should support all CPUs and machines.
|
||||||
|
|
||||||
ifeq ($(CONFIG_SOFTMMU),y)
|
ifeq ($(CONFIG_SOFTMMU),y)
|
||||||
common-obj-y = dump/
|
common-obj-y = monitor/
|
||||||
common-obj-y += monitor/
|
|
||||||
common-obj-y += net/
|
common-obj-y += net/
|
||||||
common-obj-$(CONFIG_LINUX) += fsdev/
|
common-obj-$(CONFIG_LINUX) += fsdev/
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,6 @@ endif #CONFIG_BSD_USER
|
||||||
ifdef CONFIG_SOFTMMU
|
ifdef CONFIG_SOFTMMU
|
||||||
obj-y += softmmu/
|
obj-y += softmmu/
|
||||||
obj-y += gdbstub.o
|
obj-y += gdbstub.o
|
||||||
obj-y += dump/
|
|
||||||
obj-y += hw/
|
obj-y += hw/
|
||||||
obj-y += monitor/
|
obj-y += monitor/
|
||||||
obj-y += qapi/
|
obj-y += qapi/
|
||||||
|
|
|
@ -2620,6 +2620,7 @@ int main(void) { lzo_version(); return 0; }
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "" "-llzo2" ; then
|
if compile_prog "" "-llzo2" ; then
|
||||||
libs_softmmu="$libs_softmmu -llzo2"
|
libs_softmmu="$libs_softmmu -llzo2"
|
||||||
|
lzo_libs="-llzo2"
|
||||||
lzo="yes"
|
lzo="yes"
|
||||||
else
|
else
|
||||||
if test "$lzo" = "yes"; then
|
if test "$lzo" = "yes"; then
|
||||||
|
@ -2639,6 +2640,7 @@ int main(void) { snappy_max_compressed_length(4096); return 0; }
|
||||||
EOF
|
EOF
|
||||||
if compile_prog "" "-lsnappy" ; then
|
if compile_prog "" "-lsnappy" ; then
|
||||||
libs_softmmu="$libs_softmmu -lsnappy"
|
libs_softmmu="$libs_softmmu -lsnappy"
|
||||||
|
snappy_libs='-lsnappy'
|
||||||
snappy="yes"
|
snappy="yes"
|
||||||
else
|
else
|
||||||
if test "$snappy" = "yes"; then
|
if test "$snappy" = "yes"; then
|
||||||
|
@ -7468,10 +7470,12 @@ fi
|
||||||
|
|
||||||
if test "$lzo" = "yes" ; then
|
if test "$lzo" = "yes" ; then
|
||||||
echo "CONFIG_LZO=y" >> $config_host_mak
|
echo "CONFIG_LZO=y" >> $config_host_mak
|
||||||
|
echo "LZO_LIBS=$lzo_libs" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$snappy" = "yes" ; then
|
if test "$snappy" = "yes" ; then
|
||||||
echo "CONFIG_SNAPPY=y" >> $config_host_mak
|
echo "CONFIG_SNAPPY=y" >> $config_host_mak
|
||||||
|
echo "SNAPPY_LIBS=$snappy_libs" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$bzip2" = "yes" ; then
|
if test "$bzip2" = "yes" ; then
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
obj-y += dump.o
|
|
||||||
common-obj-y += dump-hmp-cmds.o
|
|
||||||
obj-$(TARGET_X86_64) += win_dump.o
|
|
|
@ -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'))
|
|
@ -300,6 +300,14 @@ if 'CONFIG_FDT' in config_host
|
||||||
fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(),
|
fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(),
|
||||||
link_args: config_host['FDT_LIBS'].split())
|
link_args: config_host['FDT_LIBS'].split())
|
||||||
endif
|
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')
|
create_config = find_program('scripts/create_config')
|
||||||
minikconf = find_program('scripts/minikconf.py')
|
minikconf = find_program('scripts/minikconf.py')
|
||||||
|
@ -607,6 +615,7 @@ subdir('io')
|
||||||
subdir('chardev')
|
subdir('chardev')
|
||||||
subdir('fsdev')
|
subdir('fsdev')
|
||||||
subdir('target')
|
subdir('target')
|
||||||
|
subdir('dump')
|
||||||
|
|
||||||
block_ss.add(files(
|
block_ss.add(files(
|
||||||
'block.c',
|
'block.c',
|
||||||
|
|
Loading…
Reference in New Issue