[libvirt PATCH 218/351] meson: src: build virt-qemu-run binary
-export-dynamic is provided by src_dep
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/Makefile.am | 1 -
src/qemu/Makefile.inc.am | 14 --------------
src/qemu/meson.build | 12 ++++++++++++
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a8a7ea1791..8760fdf3a22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,6 @@ OPENRC_INIT_FILES =
OPENRC_INIT_FILES_IN =
OPENRC_CONF_FILES =
SYSCONF_FILES =
-bin_PROGRAMS =
COMMON_UNIT_VARS = \
-e 's|[@]runstatedir[@]|$(runstatedir)|g' \
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 129825121c7..80555d79a40 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -101,17 +101,3 @@ endif WITH_QEMU
install-data-qemu \
uninstall-data-qemu \
$(NULL)
-
-QEMU_SHIM_SOURCES = qemu/qemu_shim.c
-
-if WITH_QEMU
-bin_PROGRAMS += virt-qemu-run
-
-virt_qemu_run_SOURCES = $(QEMU_SHIM_SOURCES)
-
-virt_qemu_run_LDADD = \
- libvirt.la \
- $(GLIB_LIBS) \
- $(NULL)
-virt_qemu_run_LDFLAGS = -export-dynamic
-endif WITH_QEMU
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 121be3085fa..fca7cf1658f 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -71,6 +71,10 @@ if conf.has('WITH_DTRACE_PROBES')
)
endif
+qemu_shim_sources = files(
+ 'qemu_shim.c',
+)
+
if conf.has('WITH_QEMU')
qemu_driver_impl = static_library(
'virt_driver_qemu_impl',
@@ -113,4 +117,12 @@ if conf.has('WITH_QEMU')
'-DMODULE_NAME="qemu"',
],
}
+
+ virt_helpers += {
+ 'name': 'virt-qemu-run',
+ 'sources': [
+ qemu_shim_sources
+ ],
+ 'install_dir': bindir,
+ }
endif
--
2.26.2