From nobody Sun Feb 8 05:47:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894331; cv=none; d=zohomail.com; s=zohoarc; b=VRd2DTim8dis1k9dq/kdMPz1UBYpHlN9EtmLExUDbDD8WVZX194k47IEj7Fm16FeA0r7O+0bS/2ufpUx4Q1aMgc6Doz06AjaxaVqMoAdRcpUOUCBt3xhzdT4NZZCGDtbWscBkgXCC71Etgb3ScWzxikPcX/1s1qxQLIGc0CppFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894331; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+H43HOvZTsCc6wmC38XiuiPa3+Rypcg/n0O6+pIlWoA=; b=H9BkDQ3Sd2pfeA2hMpP2SN3sKL5ZIpN/c/hiLXk4E2u0p+gnmSvTGEQ/4Yod/hF8kfESXXJKIHu6ZyJqpx+Hiz5NP0G99ez07SC4Iha0YK5bOGKSqhhNfgmg4gOz7SNgqeNyGZUSvQDFgtxXjb2aTR1sYpM2Tt1NWgQIPRT3XD8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894331003122.80730637134161; Thu, 16 Jul 2020 03:12:11 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-126--ZWayW1FMz-45VrK3ombng-1; Thu, 16 Jul 2020 06:08:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D67F510059BD; Thu, 16 Jul 2020 10:08:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B15DE1053B03; Thu, 16 Jul 2020 10:08:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 603F7180531F; Thu, 16 Jul 2020 10:08:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA5ASi018267 for ; Thu, 16 Jul 2020 06:05:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id C7D762DE8A; Thu, 16 Jul 2020 10:05:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4192B2DE72 for ; Thu, 16 Jul 2020 10:05:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894329; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+H43HOvZTsCc6wmC38XiuiPa3+Rypcg/n0O6+pIlWoA=; b=DjOwv2ebOzmTw3yKRRCXkk89Fku9Xm5o3nfAtP499WtuXFRQ57Xn+y2yt2uVCaAOfnoF6c tP9bZp+/KdyLnvQxtW8jHaZYCkpe6+D4YqaSszmbmMPJzQi3TRif+al9hrrgKbc61jyxkl drG7vJRunN7ejAPeKJr6AB0Lqdt+pnc= X-MC-Unique: -ZWayW1FMz-45VrK3ombng-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 197/351] meson: src: add support for building daemon binaries Date: Thu, 16 Jul 2020 11:57:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/meson.build | 51 ++++++++++++++++++++++++++++++++++++++ src/remote/Makefile.inc.am | 41 ------------------------------ 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/src/meson.build b/src/meson.build index 13f231f4345..3774e2bb4ba 100644 --- a/src/meson.build +++ b/src/meson.build @@ -131,6 +131,14 @@ libvirt_libs =3D [] # * install_dir - installation directory (optional, default libdir / 'li= bvirt' / 'connection-driver' virt_modules =3D [] =20 +# virt_daemons: +# each entry is a dictionary with following items: +# * name - binary name (rquired) +# * sources - binary sources (optional, default remote_daemon_sources) +# * c_args - compile arguments (optional, default []) +# * include =3D include_directories (optional, default []) +virt_daemons =3D [] + =20 # list subdirectories =20 @@ -458,3 +466,46 @@ foreach module : virt_modules ) set_variable('@0@_module'.format(module['name'].underscorify()), mod) endforeach + + +# build libvirt daemons + +foreach daemon : virt_daemons + bin =3D executable( + daemon['name'], + [ + daemon.get('sources', [ remote_daemon_sources, remote_daemon_generat= ed ]), + dtrace_gen_objects, + ], + c_args: [ + daemon.get('c_args', []), + ], + include_directories: [ + conf_inc_dir, + remote_inc_dir, + daemon.get('include', []), + ], + dependencies: [ + access_dep, + dbus_dep, + gnutls_dep, + libnl_dep, + rpc_dep, + src_dep, + sasl_dep, + xdr_dep, + ], + link_with: [ + admin_driver_lib, + libvirt_lib, + libvirt_lxc_lib, + libvirt_qemu_lib, + ], + link_args: [ + libvirt_no_undefined, + ], + install: true, + install_dir: sbindir, + install_rpath: libdir, + ) +endforeach diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 9866903847e..eb281a4c4da 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -1,46 +1,5 @@ # vim: filetype=3Dautomake =20 -REMOTE_DAEMON_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(XDR_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBNL_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ - -I$(builddir)/rpc \ - -I$(builddir)/remote \ - $(NULL) - -REMOTE_DAEMON_LD_FLAGS =3D \ - $(AM_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - -REMOTE_DAEMON_LD_ADD =3D \ - libvirt_driver_admin.la \ - libvirt-lxc.la \ - libvirt-qemu.la \ - libvirt.la \ - $(LIBXML_LIBS) \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(XDR_LIBS) \ - $(DBUS_LIBS) \ - $(LIBNL_LIBS) \ - $(NULL) - -if WITH_DTRACE_PROBES -REMOTE_DAEMON_LD_ADD +=3D ../src/libvirt_probes.lo -endif WITH_DTRACE_PROBES - -REMOTE_DAEMON_LD_ADD +=3D \ - $(GLIB_LIBS) \ - $(NULL) - LOGROTATE_FILES_IN +=3D \ remote/libvirtd.qemu.logrotate.in \ remote/libvirtd.lxc.logrotate.in \ --=20 2.26.2