[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 019/132] contrib/elf2dmp: convert to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 019/132] contrib/elf2dmp: convert to meson |
Date: |
Thu, 12 Dec 2019 13:51:03 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 4 ----
Makefile.objs | 6 ------
configure | 3 ---
contrib/elf2dmp/Makefile.objs | 4 ----
contrib/elf2dmp/meson.build | 4 ++++
meson.build | 6 ++++++
6 files changed, 10 insertions(+), 17 deletions(-)
delete mode 100644 contrib/elf2dmp/Makefile.objs
create mode 100644 contrib/elf2dmp/meson.build
diff --git a/Makefile b/Makefile
index d697aab..6f2141f 100644
--- a/Makefile
+++ b/Makefile
@@ -262,7 +262,6 @@ dummy := $(call unnest-vars,, \
authz-obj-y \
chardev-obj-y \
qga-obj-y \
- elf2dmp-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
@@ -448,9 +447,6 @@ ifneq ($(EXESUF),)
qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
endif
-elf2dmp$(EXESUF): $(elf2dmp-obj-y)
- $(call LINK, $^)
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/Makefile.objs b/Makefile.objs
index 919961f..e91cdb9 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -103,9 +103,3 @@ util-obj-y += trace/
# extracted into a QAPI schema module, or perhaps a separate schema.
qga-obj-y = qga/
qga-vss-dll-obj-y = qga/
-
-######################################################################
-# contrib
-elf2dmp-obj-y = contrib/elf2dmp/
-
-######################################################################
diff --git a/configure b/configure
index d59c831..b38da39 100755
--- a/configure
+++ b/configure
@@ -6065,9 +6065,6 @@ if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) $tools"
fi
- if [ "$curl" = "yes" ]; then
- tools="elf2dmp\$(EXESUF) $tools"
- fi
fi
if test "$softmmu" = yes ; then
if test "$linux" = yes; then
diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs
deleted file mode 100644
index 1505716..0000000
--- a/contrib/elf2dmp/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-elf2dmp-obj-y = main.o addrspace.o download.o pdb.o qemu_elf.o
-
-download.o-cflags := $(CURL_CFLAGS)
-download.o-libs := $(CURL_LIBS)
diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build
new file mode 100644
index 0000000..b9e5199
--- /dev/null
+++ b/contrib/elf2dmp/meson.build
@@ -0,0 +1,4 @@
+if 'CONFIG_CURL' in config_host
+ executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.c',
'qemu_elf.c'),
+ dependencies: [glib, curl])
+endif
diff --git a/meson.build b/meson.build
index e2eee80..25c3db9 100644
--- a/meson.build
+++ b/meson.build
@@ -70,6 +70,11 @@ if 'CONFIG_VIRGL' in config_host
virgl = declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].split(),
link_args: config_host['VIRGL_LIBS'].split())
endif
+curl = declare_dependency()
+if 'CONFIG_CURL' in config_host
+ curl = declare_dependency(compile_args: config_host['CURL_CFLAGS'].split(),
+ link_args: config_host['CURL_LIBS'].split())
+endif
target_dirs = config_host['TARGET_DIRS'].split()
have_user = false
@@ -208,6 +213,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
if have_tools
subdir('contrib/rdmacm-mux')
+ subdir('contrib/elf2dmp')
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
--
1.8.3.1
- [PATCH 010/132] meson: add remaining generated tcg trace helpers, (continued)
- [PATCH 010/132] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2019/12/12
- [PATCH 004/132] configure: integrate Meson in the build system, Paolo Bonzini, 2019/12/12
- [PATCH 011/132] meson: add version.o, Paolo Bonzini, 2019/12/12
- [PATCH 013/132] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 012/132] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 014/132] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 015/132] contrib/rdmacm-mux: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 016/132] contrib/vhost-user-input: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 017/132] contrib/vhost-user-gpu: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 018/132] contrib/ivshmem: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 019/132] contrib/elf2dmp: convert to meson,
Paolo Bonzini <=
- [PATCH 021/132] meson: convert vss-win32, Paolo Bonzini, 2019/12/12
- [PATCH 020/132] meson: convert qemu-ga, Paolo Bonzini, 2019/12/12
- [PATCH 022/132] meson: add msi generation, Paolo Bonzini, 2019/12/12
- [PATCH 023/132] meson: add qemu-bridge-helper, Paolo Bonzini, 2019/12/12
- [PATCH 024/132] meson: add qemu-keymap, Paolo Bonzini, 2019/12/12
- [PATCH 025/132] meson: add qemu-edid, Paolo Bonzini, 2019/12/12
- [PATCH 009/132] libqemuutil: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 027/132] meson: keymap-gen, Paolo Bonzini, 2019/12/12
- [PATCH 029/132] meson: generate shader headers, Paolo Bonzini, 2019/12/12
- [PATCH 026/132] meson: add virtfs-proxy-helper, Paolo Bonzini, 2019/12/12