[libvirt PATCH 176/351] meson: src: build libvirt_driver_qemu.so shared module

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:56:52 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/qemu/Makefile.inc.am | 13 -------------
 src/qemu/meson.build     | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 3d703d15d33..f2b5e3a77f6 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -4,19 +4,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 
 if WITH_QEMU
-libvirt_driver_qemu_la_SOURCES =
-libvirt_driver_qemu_la_LIBADD = \
-	libvirt_driver_qemu_impl.la \
-	libvirt.la \
-	$(GLIB_LIBS) \
-	$(NULL)
-mod_LTLIBRARIES += libvirt_driver_qemu.la
-libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-if WITH_DTRACE_PROBES
-libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo
-endif WITH_DTRACE_PROBES
-
 sbin_PROGRAMS += virtqemud
 
 nodist_conf_DATA += qemu/virtqemud.conf
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 14b700558df..209cb5f4956 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -92,4 +92,17 @@ if conf.has('WITH_QEMU')
       hypervisor_inc_dir,
     ],
   )
+
+  virt_modules += {
+    'name': 'virt_driver_qemu',
+    'sources': [
+      qemu_dtrace_gen_objects,
+    ],
+    'link_whole': [
+      qemu_driver_impl,
+    ],
+    'link_args': [
+      libvirt_no_undefined,
+    ],
+  }
 endif
-- 
2.26.2




More information about the libvir-list mailing list