From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 22 Jun 2020 13:35:51 +0000 (+0200)
Subject: meson: src: build libvirt_driver_qemu.so shared module
X-Git-Tag: v6.7.0-rc1~427
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea42db4c2318534fde3b894f2c82d4e734de453d;p=thirdparty%2Flibvirt.git

meson: src: build libvirt_driver_qemu.so shared module

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 3d703d15d3..f2b5e3a77f 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 a2f5c0c8c4..a98f57f0f8 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -96,4 +96,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