From nobody Mon Feb 9 05:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894150; cv=none; d=zohomail.com; s=zohoarc; b=INhyUH3rOlgF53ZG1mBqPi5WIfL8R+xGH/u+N/PIqQo7hgk5qpeAn2TooYh9nbzFFnbms6wqXvjEfKfJVHN6wYXkIRYBgkROtw++a/sTm/+w+ghUVEI4pJG7tqTAgrNjUn4duQ6CLqzaP/ta8nhLsJfKOuIbAwwVmUNK0DR6bmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894150; 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=0lbOcL+/TKXnwEksJrJqah3adjlmAd7h1yw023SynZo=; b=R/YCHZzQrPxmpTu5rlA9KcT+5/FqlDT+6xF1B7lfAZ4zRcaA9OdC2nkKxSFOZpv2ZxSWlJJrtl2oGlkgjgU3Hb05mqWYps4W8W9teMcAc+IVLjn3ns+PtFHPYQtVq5U2Yd+Ag0atvIquDG48Fr8y7DD/r3DWiD4GdfBC2j7OPSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894150960567.3912270371128; Thu, 16 Jul 2020 03:09:10 -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-510-FaTLTu-dNQWdaSph5TFWHA-1; Thu, 16 Jul 2020 06:08:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41204108D; Thu, 16 Jul 2020 10:08:38 +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 1DE596FEFB; Thu, 16 Jul 2020 10:08:38 +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 E0A2D180530F; Thu, 16 Jul 2020 10:08:37 +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 06GA47fF017678 for ; Thu, 16 Jul 2020 06:04:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC0FD2DE69; Thu, 16 Jul 2020 10:04:07 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 262FC2B6DB for ; Thu, 16 Jul 2020 10:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894149; 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=0lbOcL+/TKXnwEksJrJqah3adjlmAd7h1yw023SynZo=; b=TR3RzMgQtNwWjaoBTnKgM54Jq1zPQgLb3VK+4kH0HEyOptp3z1qOGguqCXfzTSftpCHjq7 XqxUNtOFoUlXPylzitaqI6KoC8xlG4jOJS9483alP51du65iLWf6KmHbgocTo4msbXJ+bt rDfbPVQSaUqH6yf3P6lVgl7tqOZYgOg= X-MC-Unique: FaTLTu-dNQWdaSph5TFWHA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 159/351] meson: src: build liblockd_impl.a static library Date: Thu, 16 Jul 2020 11:56:35 +0200 Message-Id: <1a15540e5726393854a369deb4f03e5a85d979f0.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.12 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" This introduces intermediate static library that is required for following remote protocol check. Signed-off-by: Pavel Hrdina --- src/locking/Makefile.inc.am | 34 ++-------------------------- src/locking/meson.build | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 3afc9803ce0..b8eac29d242 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -6,22 +6,10 @@ LOCK_DRIVER_SANLOCK_SOURCES =3D \ LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ locking/sanlock_helper.c =20 -LOCK_PROTOCOL_GENERATED =3D \ - locking/lock_protocol.h \ - locking/lock_protocol.c \ - $(NULL) - LOCK_DAEMON_GENERATED =3D \ locking/lock_daemon_dispatch_stubs.h $(NULL) =20 -LOCK_PROTOCOL =3D $(srcdir)/locking/lock_protocol.x - -LOCK_DRIVER_LOCKD_SOURCES =3D \ - locking/lock_driver_lockd.c \ - locking/lock_driver_lockd.h \ - $(NULL) - LOCK_DAEMON_SOURCES =3D \ locking/lock_daemon.h \ locking/lock_daemon.c \ @@ -55,23 +43,11 @@ lockdriver_LTLIBRARIES =3D =20 if WITH_LIBVIRTD lockdriver_LTLIBRARIES +=3D lockd.la -lockd_la_SOURCES =3D \ - $(LOCK_DRIVER_LOCKD_SOURCES) \ - $(NULL) -nodist_lockd_la_SOURCES =3D \ - $(LOCK_PROTOCOL_GENERATED) \ - $(NULL) -lockd_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/locking \ - -I$(builddir)/locking \ - -I$(builddir)/rpc \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) +lockd_la_SOURCES =3D lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) lockd_la_LIBADD =3D \ libvirt.la \ + libvirt_lockd_impl.la \ $(GLIB_LIBS) \ $(XDR_LIBS) \ $(NULL) @@ -80,12 +56,6 @@ if WITH_DTRACE_PROBES lockd_la_LIBADD +=3D libvirt_probes.lo endif WITH_DTRACE_PROBES =20 -if WITH_SASL -lockd_la_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - if WITH_QEMU augeastest_DATA +=3D locking/test_libvirt_lockd.aug nodist_conf_DATA +=3D locking/qemu-lockd.conf diff --git a/src/locking/meson.build b/src/locking/meson.build index 18b2e3c72a6..d8255d00f64 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -1,9 +1,35 @@ +lock_protocol =3D 'lock_protocol.x' + lock_driver_sources =3D [ 'lock_manager.c', 'lock_driver_nop.c', 'domain_lock.c', ] =20 +lock_driver_lockd_sources =3D [ + 'lock_driver_lockd.c', +] + +lock_protocol_generated =3D [] + +lock_protocol_generated +=3D custom_target( + 'lock_protocol.h', + input: lock_protocol, + output: 'lock_protocol.h', + command: [ + genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@', + ], +) + +lock_protocol_generated +=3D custom_target( + 'lock_protocol.c', + input: lock_protocol, + output: 'lock_protocol.c', + command: [ + genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', + ], +) + lock_driver_lib =3D static_library( 'virt_lock_driver', [ @@ -18,3 +44,22 @@ lock_driver_lib =3D static_library( ) =20 libvirt_libs +=3D lock_driver_lib + +if conf.has('WITH_LIBVIRTD') + lockd_lib_impl =3D static_library( + 'lockd_impl', + [ + files(lock_driver_lockd_sources), + lock_protocol_generated, + ], + include_directories: [ + conf_inc_dir, + ], + dependencies: [ + rpc_dep, + sasl_dep, + src_dep, + xdr_dep, + ], + ) +endif --=20 2.26.2