[libvirt PATCH 198/351] meson: src: build virtbhyved daemon binary

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:57:14 UTC 2020


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

diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 40384e1c714..ab681685b2b 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -4,22 +4,10 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
 
 if WITH_BHYVE
-sbin_PROGRAMS += virtbhyved
-
 nodist_conf_DATA += bhyve/virtbhyved.conf
 augeas_DATA += bhyve/virtbhyved.aug
 augeastest_DATA += bhyve/test_virtbhyved.aug
 
-virtbhyved_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtbhyved_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtbhyved_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtbhyved\"" \
-       -DMODULE_NAME="\"bhyve\"" \
-       $(NULL)
-virtbhyved_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtbhyved_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 bhyve/virtbhyved.conf: remote/libvirtd.conf.in
 	$(AM_V_GEN)$(SED) \
 		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build
index 83d8c366635..5807d67591a 100644
--- a/src/bhyve/meson.build
+++ b/src/bhyve/meson.build
@@ -35,4 +35,12 @@ if conf.has('WITH_BHYVE')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtbhyved',
+    'c_args': [
+      '-DDAEMON_NAME="virtbhyved"',
+      '-DMODULE_NAME="bhyve"'
+    ],
+  }
 endif
-- 
2.26.2




More information about the libvir-list mailing list