From nobody Sun Feb 8 20:13:06 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=1594894072; cv=none; d=zohomail.com; s=zohoarc; b=UjJkE6kUXpUJpqBqcEY3iHdKuERUgEr5SCm/ikAiNZRMg6nZTpeiCCA7rpmNaW51XsyAdwyywlJtIck+8tJ3rG5ouoGFxj/HMNfWn8hrrtoVR+QkE1LKdhcpHYDbCvGrPvWCaBa7I4Q1j+0l4dyvsvOzfh3g8PA1WYABToJEgaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894072; 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=SrveE9E/E2nXN748Bzykk687xXPcHqjBcYvl7iLO+9M=; b=TJ8G4REWrjvivG3Gcd/OW5Q3MbUGCS/a5f9o0W6dvuLxLgKa/r3Jej+Tm84Fv4GaWKmrDS6zhDpOR+i+jhzy7BbA2lTMWyutiHP+5BJ2Y6HNiZ/CjZBKl29ijBo8/KHeutlMw88vt1kmvfzON0okub5C4QLSmNN36lTzQLBUIVU= 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 1594894072701494.68234142671884; Thu, 16 Jul 2020 03:07:52 -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-319-vFbm5UxGMoGVxACBZpRL3A-1; Thu, 16 Jul 2020 06:07:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DEAEB1888AA2; Thu, 16 Jul 2020 10:07:43 +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 BD6CF79D06; Thu, 16 Jul 2020 10:07: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 88E131805311; Thu, 16 Jul 2020 10:07: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 06GA4D0u017759 for ; Thu, 16 Jul 2020 06:04:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1FD742DE73; Thu, 16 Jul 2020 10:04:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F9AF2DE69 for ; Thu, 16 Jul 2020 10:04:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894071; 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=SrveE9E/E2nXN748Bzykk687xXPcHqjBcYvl7iLO+9M=; b=QlftY6zxcUt2hY905pSnXD598p1eH1HEcgZcJqlS7I49+qqvXzk7afMj6SXxFpJDP5grM3 ican31ssbd4j8LBYPFJyvt5M4Fzh/MVh6fuYZfAtoN5Y24rFw3VDzkcmhCUqZZ3x1nMZCF GUgThLEVA64ePTRiCzAm8d/FWO28LuE= X-MC-Unique: vFbm5UxGMoGVxACBZpRL3A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 165/351] meson: src: build libvirt_storage_driver_impl.a static library Date: Thu, 16 Jul 2020 11:56:41 +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.79 on 10.5.11.13 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/storage/Makefile.inc.am | 30 ------------------------------ src/storage/meson.build | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 src/storage/meson.build diff --git a/src/meson.build b/src/meson.build index bfc60fc967e..aac5a256b07 100644 --- a/src/meson.build +++ b/src/meson.build @@ -147,6 +147,7 @@ subdir('network') subdir('node_device') subdir('nwfilter') subdir('security') +subdir('storage') =20 subdir('bhyve') subdir('esx') diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index e201b9938d9..87ba8c0bd16 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,18 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_BACKEND_SOURCES =3D \ - storage/storage_backend.h \ - storage/storage_backend.c \ - $(NULL) - -STORAGE_DRIVER_SOURCES =3D \ - storage/storage_driver.h \ - storage/storage_driver.c \ - $(STORAGE_DRIVER_BACKEND_SOURCES) \ - storage/storage_util.h \ - storage/storage_util.c \ - $(NULL) - STORAGE_DRIVER_FS_SOURCES =3D \ storage/storage_backend_fs.h \ storage/storage_backend_fs.c \ @@ -98,23 +85,7 @@ storagebackend_LTLIBRARIES =3D storagefiledir =3D $(libdir)/libvirt/storage-file storagefile_LTLIBRARIES =3D =20 -# Needed to keep automake quiet about conditionals -libvirt_driver_storage_impl_la_SOURCES =3D -libvirt_driver_storage_impl_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_storage_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_storage_impl_la_LIBADD =3D $(SECDRIVER_LIBS) $(LIBXML_LIBS) -if WITH_BLKID -libvirt_driver_storage_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_driver_storage_impl_la_LIBADD +=3D $(BLKID_LIBS) -endif WITH_BLKID - if WITH_STORAGE -noinst_LTLIBRARIES +=3D libvirt_driver_storage_impl.la libvirt_driver_storage_la_SOURCES =3D libvirt_driver_storage_la_LIBADD =3D \ libvirt_driver_storage_impl.la \ @@ -123,7 +94,6 @@ libvirt_driver_storage_la_LIBADD =3D \ $(NULL) mod_LTLIBRARIES +=3D libvirt_driver_storage.la libvirt_driver_storage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_storage_impl_la_SOURCES +=3D $(STORAGE_DRIVER_SOURCES) =20 sbin_PROGRAMS +=3D virtstoraged =20 diff --git a/src/storage/meson.build b/src/storage/meson.build new file mode 100644 index 00000000000..36ef45b10ab --- /dev/null +++ b/src/storage/meson.build @@ -0,0 +1,27 @@ +storage_driver_backend_sources =3D [ + 'storage_backend.c', +] + +storage_driver_sources =3D [ + 'storage_driver.c', + 'storage_util.c', + storage_driver_backend_sources, +] + +if conf.has('WITH_STORAGE') + storage_driver_impl_lib =3D static_library( + 'virt_storage_driver_impl', + [ + storage_driver_sources, + ], + dependencies: [ + access_dep, + blkid_dep, + secdriver_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2