From nobody Sun Feb 8 09:27:35 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=1594894941; cv=none; d=zohomail.com; s=zohoarc; b=DxackBz+P1HvzGt4G4fQV/IXE1unL9rqvfI4qot+0nUINwekQDPry9uvW3e/nnre70bHPA3HZnc+shy3iBmHwuQGHmlPLiT1AJBBgTnQVBZ3RVLF74gJ9B/3Jd+AumjPh1NNIdUCMgugTajD04HSNoAKAVzsPrAaDBzAwer03GQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894941; 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=HtsR9AC32jW8gaV5WDHr0LgdVy2rRLh8cXzKKHezNVk=; b=FPrwu64pQAg+urv/VhiMl3pRElh8hJLzBsE97a1Y7YUCOw/jpzSbbGdl0AXS6FP/Amd9m/Fp0mLgsSpnAoEv+N1Vu314BvG+o7CSJRPPuWGy9IxZ0bjANfcub9O9MGROlS7U5T3XhN9tPy5/g4Sfh83HzqIckfHyevZwn1wYVq8= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 159489494190262.337520401598226; Thu, 16 Jul 2020 03:22:21 -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-301-1qOxawquPmaOr46G6qwRlA-1; Thu, 16 Jul 2020 06:08:50 -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 805C58027F6; Thu, 16 Jul 2020 10:08:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F86C710D7; Thu, 16 Jul 2020 10:08:43 +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 3282F730F8; Thu, 16 Jul 2020 10:08:43 +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 06GA4B4U017733 for ; Thu, 16 Jul 2020 06:04:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 504A12DE73; Thu, 16 Jul 2020 10:04:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDD2A2DE69 for ; Thu, 16 Jul 2020 10:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894940; 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=HtsR9AC32jW8gaV5WDHr0LgdVy2rRLh8cXzKKHezNVk=; b=WFyJP9z1aekFv0Kz1m1GTlREMH+kHF0BSdUKPmaomvP4cF9Y3nfZkH4y5q9d3pAPrae40X 5kBpqHkhMUoF1qFTHKERpewArBsKOzWZtP5dcQRR/rUEWGoqNUpYo3x1rI92kWdkrRTHa5 bKB8aDBMNvFIvOt2Aaz0FxRvcrUuShM= X-MC-Unique: 1qOxawquPmaOr46G6qwRlA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 163/351] meson: src: build libvirt_driver_nwfilter_impl.a static library Date: Thu, 16 Jul 2020 11:56:39 +0200 Message-Id: <205bb0b0acf16977d6527033f7b92d35fa1495eb.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/nwfilter/Makefile.inc.am | 37 +++--------------------------------- src/nwfilter/meson.build | 26 +++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 src/nwfilter/meson.build diff --git a/src/meson.build b/src/meson.build index 12dea398679..66af0e3051c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -145,6 +145,7 @@ subdir('locking') subdir('logging') subdir('network') subdir('node_device') +subdir('nwfilter') subdir('security') =20 subdir('bhyve') diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 758370e1a74..ba07992027c 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -2,20 +2,6 @@ =20 NWFILTER_XML_FILES =3D $(wildcard $(srcdir)/nwfilter/xml/*.xml) =20 -NWFILTER_DRIVER_SOURCES =3D \ - nwfilter/nwfilter_driver.h \ - nwfilter/nwfilter_driver.c \ - nwfilter/nwfilter_tech_driver.h \ - nwfilter/nwfilter_gentech_driver.c \ - nwfilter/nwfilter_gentech_driver.h \ - nwfilter/nwfilter_dhcpsnoop.c \ - nwfilter/nwfilter_dhcpsnoop.h \ - nwfilter/nwfilter_ebiptables_driver.c \ - nwfilter/nwfilter_ebiptables_driver.h \ - nwfilter/nwfilter_learnipaddr.c \ - nwfilter/nwfilter_learnipaddr.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) @@ -25,29 +11,12 @@ if WITH_NWFILTER nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 -noinst_LTLIBRARIES +=3D libvirt_driver_nwfilter_impl.la libvirt_driver_nwfilter_la_SOURCES =3D -libvirt_driver_nwfilter_la_LIBADD =3D libvirt_driver_nwfilter_impl.la +libvirt_driver_nwfilter_la_LIBADD =3D \ + libvirt_driver_nwfilter_impl.la \ + libvirt.la mod_LTLIBRARIES +=3D libvirt_driver_nwfilter.la libvirt_driver_nwfilter_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ - $(LIBPCAP_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_nwfilter_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_nwfilter_impl_la_LIBADD =3D \ - libvirt.la \ - $(LIBPCAP_LIBS) \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES) =20 sbin_PROGRAMS +=3D virtnwfilterd =20 diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build new file mode 100644 index 00000000000..fe792058b94 --- /dev/null +++ b/src/nwfilter/meson.build @@ -0,0 +1,26 @@ +nwfilter_driver_sources =3D [ + 'nwfilter_driver.c', + 'nwfilter_gentech_driver.c', + 'nwfilter_dhcpsnoop.c', + 'nwfilter_ebiptables_driver.c', + 'nwfilter_learnipaddr.c', +] + +if conf.has('WITH_NWFILTER') + nwfilter_driver_impl =3D static_library( + 'virt_driver_nwfilter_impl', + [ + nwfilter_driver_sources, + ], + dependencies: [ + access_dep, + dbus_dep, + libnl_dep, + libpcap_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2