From nobody Sun Feb 8 21:06:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594894699; cv=none; d=zohomail.com; s=zohoarc; b=eNY6fVJRMuSxnu2XfQZExhPQDDEPYGBHAcNb4sK8KfXeiNH4BCtb4d7GFnAHm9+SaqK056dLTuEzPttvxPMoPK46+HzqOyBgqy5Qt2pwp/k1K5VYs44/Pae7uAutQKaN3Kd81zTLWenkBrr9TbnDZ+KbAhfuLsG4vFG2NOyBLW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894699; 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=IN+Blyemn8WpJGHiy2PsjrbExmFOGhaskLSKV24rzM0=; b=RDj2cjnaS5ekDz9Q3bi9WfTAIVPB/WRVZxuI16VPYNF8NIak8MfQjIt3W/R2uYLAFhFLLF1ZYklHekCLlPY8+d8+U9dEZoqtrG7ylojwJb2wGHOhncH1j8gr48/tQHCZGRhUiOL9ncRtKnwuXsCw2taMme2sqcL824GHljk6Hek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 159489469957667.12521040901402; Thu, 16 Jul 2020 03:18:19 -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-143-YmAfH1UmPDuPpoVURCKwRQ-1; Thu, 16 Jul 2020 06:08:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EA2310AF; Thu, 16 Jul 2020 10:08:40 +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 6FDE2710D7; Thu, 16 Jul 2020 10:08:40 +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 3DBF81805317; Thu, 16 Jul 2020 10:08:40 +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 06GA49vp017703 for ; Thu, 16 Jul 2020 06:04:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E2182DE69; Thu, 16 Jul 2020 10:04:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBAE22B6DB for ; Thu, 16 Jul 2020 10:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894698; 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=IN+Blyemn8WpJGHiy2PsjrbExmFOGhaskLSKV24rzM0=; b=RLdmGEdO+Oda/urUV+OlE8j5VfdDlhVH6aDYNwwHNMV1uWwxI2Vj9qR6yM/kezY8hdyk+W 5a5qdJ5gr/zBgUPLGFt0BC/uNgH/NKYEjdku8HWXxYFrPt3DuMT/Ie6jml6PxkbOA7pvBc /P3pQItkutPqRcg8w5VlUOkcg/lqcYg= X-MC-Unique: YmAfH1UmPDuPpoVURCKwRQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 161/351] meson: src: build libvirt_driver_network_impl.a static library Date: Thu, 16 Jul 2020 11:56:37 +0200 Message-Id: <9a486381828ddc520493317992937012f0ee9c45.1594891445.git.phrdina@redhat.com> 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.79 on 10.5.11.15 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 | 1 + src/network/Makefile.inc.am | 23 ----------------------- src/network/meson.build | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/network/meson.build diff --git a/src/meson.build b/src/meson.build index 217ceb2d6ef..aab85399948 100644 --- a/src/meson.build +++ b/src/meson.build @@ -143,6 +143,7 @@ subdir('remote') subdir('admin') subdir('locking') subdir('logging') +subdir('network') subdir('security') =20 subdir('bhyve') diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 5a5d1630a08..c93b2e693d0 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -1,17 +1,5 @@ # vim: filetype=3Dautomake =20 -NETWORK_DRIVER_SOURCES =3D \ - network/bridge_driver.h \ - network/bridge_driver.c \ - network/bridge_driver_platform.h \ - network/bridge_driver_platform.c \ - $(NULL) - -NETWORK_DRIVER_PLATFORM_INC =3D \ - network/bridge_driver_linux.c \ - network/bridge_driver_nop.c \ - $(NULL) - NETWORK_LEASES_HELPER_SOURCES =3D \ network/leaseshelper.c \ $(NULL) @@ -35,17 +23,6 @@ libvirt_driver_network_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_network.la libvirt_driver_network_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_network_impl_la_CFLAGS =3D \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_network_impl_la_SOURCES =3D $(NETWORK_DRIVER_SOURCES) -libvirt_driver_network_impl_la_LIBADD =3D $(DBUS_LIBS) $(LIBXML_LIBS) - sbin_PROGRAMS +=3D virtnetworkd =20 nodist_conf_DATA +=3D network/virtnetworkd.conf diff --git a/src/network/meson.build b/src/network/meson.build new file mode 100644 index 00000000000..2b05544fd22 --- /dev/null +++ b/src/network/meson.build @@ -0,0 +1,22 @@ +network_driver_sources =3D [ + 'bridge_driver.c', + 'bridge_driver_platform.c', +] + +if conf.has('WITH_NETWORK') + network_driver_impl =3D static_library( + 'virt_driver_network_impl', + [ + network_driver_sources, + ], + dependencies: [ + access_dep, + dbus_dep, + libnl_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2