From c6f7aa995e8212f1f85fe1036319f958348bc732 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 22 Jun 2020 16:29:23 +0200 Subject: [PATCH] meson: src: build virtbhyved daemon binary Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 40384e1c71..ab681685b2 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 83d8c36663..5807d67591 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