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

meson: src: build libvirt_driver_bhyve.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/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 3433e6a3da..40384e1c71 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -4,15 +4,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
 
 if WITH_BHYVE
-libvirt_driver_bhyve_la_SOURCES =
-libvirt_driver_bhyve_la_LIBADD = \
-	libvirt_driver_bhyve_impl.la \
-	libvirt.la \
-	$(GLIB_LIBS) \
-	$(NULL)
-mod_LTLIBRARIES += libvirt_driver_bhyve.la
-libvirt_driver_bhyve_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
 sbin_PROGRAMS += virtbhyved
 
 nodist_conf_DATA += bhyve/virtbhyved.conf
diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build
index a9af677440..83d8c36663 100644
--- a/src/bhyve/meson.build
+++ b/src/bhyve/meson.build
@@ -25,4 +25,14 @@ if conf.has('WITH_BHYVE')
       hypervisor_inc_dir,
     ],
   )
+
+  virt_modules += {
+    'name': 'virt_driver_bhyve',
+    'link_whole': [
+      bhyve_driver_impl,
+    ],
+    'link_args': [
+      libvirt_no_undefined,
+    ],
+  }
 endif