[libvirt PATCH 208/351] meson: src: build libvirtd daemon binary

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


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

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index eb281a4c4da..f6669bd25f6 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -62,7 +62,7 @@ OPENRC_CONF_FILES += \
 
 if WITH_LIBVIRTD
 
-sbin_PROGRAMS += libvirtd virtproxyd
+sbin_PROGRAMS += virtproxyd
 
 augeas_DATA += \
 	remote/libvirtd.aug \
@@ -79,22 +79,6 @@ nodist_conf_DATA += \
 	remote/virtproxyd.conf \
 	$(NULL)
 
-libvirtd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-
-nodist_libvirtd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-
-libvirtd_CFLAGS = \
-	$(REMOTE_DAEMON_CFLAGS) \
-	-DSOCK_PREFIX="\"libvirt\"" \
-	-DDAEMON_NAME="\"libvirtd\"" \
-	-DWITH_IP \
-	-DLIBVIRTD \
-	$(NULL)
-
-libvirtd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-
-libvirtd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 virtproxyd_SOURCES = $(REMOTE_DAEMON_SOURCES)
 nodist_virtproxyd_SOURCES = $(REMOTE_DAEMON_GENERATED)
 virtproxyd_CFLAGS = \
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 1e3e3479c80..8cb53b2c782 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -82,6 +82,18 @@ if conf.has('WITH_REMOTE')
   )
 
   libvirt_libs += remote_driver_lib
+
+  if conf.has('WITH_LIBVIRTD')
+    virt_daemons += {
+      'name': 'libvirtd',
+      'c_args': [
+        '-DSOCK_PREFIX="libvirt"',
+        '-DDAEMON_NAME="libvirtd"',
+        '-DWITH_IP',
+        '-DLIBVIRTD',
+      ],
+    }
+  endif
 endif
 
 if conf.has('WITH_REMOTE')
-- 
2.26.2




More information about the libvir-list mailing list