From nobody Sun Feb 8 17:46:35 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=1594894273; cv=none; d=zohomail.com; s=zohoarc; b=cgQj0oelTyLN/rSE6uajuHHp1W9Ar0+gMs49bCX6V4JP3tPCe0CC9QpG+HVGUmS7gHeII52Kel/Em1v22f2Mw5zeNQRBeZ3JYZ7peSU4/go1Jdicd7kHzjHh2djWc6o5Qp5wM0uM1g/sC59kT1WlGFV7MEa6Qc0oCe/rwgxxQoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894273; 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=HoittmQaC2jQd2nOWMrCj++bLNR5YCx663Z7w+5rrUA=; b=CMcEMdGuBCnzoZGQE1+qwez4W5D45HwVH96svwFGb5QWZKSrIwtFFrN4J96xVVCC/7ltzBHCd2h8m9XMJ08r3mXElyVDO1gPXN12O1aadyM9Bfw+Bun/fLZDq+ATZMYfl6EZ9l5Hxy0JK0XeQYC6bVXBgwrM4rPSJ1uN4XTmOpQ= 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 1594894273429202.65153855586084; Thu, 16 Jul 2020 03:11:13 -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-256-0fg7HdHPO-y3clHQDqqjSQ-1; Thu, 16 Jul 2020 06:08:23 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 909D71093; Thu, 16 Jul 2020 10:08:16 +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 6FFB919C4F; Thu, 16 Jul 2020 10:08:16 +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 3EC83730C8; Thu, 16 Jul 2020 10:08:16 +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 06GA3cwf017322 for ; Thu, 16 Jul 2020 06:03:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 77CEF2DE69; Thu, 16 Jul 2020 10:03:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E44902B6DB for ; Thu, 16 Jul 2020 10:03:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894272; 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=HoittmQaC2jQd2nOWMrCj++bLNR5YCx663Z7w+5rrUA=; b=gnmO5wA1KMrler3OR5ucW+5WDrvSj7Idija8TbCleT5gTXjoKZCqiGfE5dk6YqQR9aKi0R DmhJO5CR2l8nQuofGhav7oyRh0XSj7e6rt7nUJAN65pgmErY/Ssfr5F3XG7TTmW4jZGI7N M8VNRAlP1JMTyVLTgfx55v6RBk8BU10= X-MC-Unique: 0fg7HdHPO-y3clHQDqqjSQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 132/351] meson: src: build libvirt_rpc static libs Date: Thu, 16 Jul 2020 11:56:08 +0200 Message-Id: <8134f24179216b6e20cea3060bfe29a2dbe9f9ae.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.84 on 10.5.11.23 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/Makefile.am | 10 ---- src/meson.build | 1 + src/rpc/Makefile.inc.am | 119 ---------------------------------------- src/rpc/meson.build | 108 ++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 129 deletions(-) delete mode 100644 src/rpc/Makefile.inc.am create mode 100644 src/rpc/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index 01ae2596c31..ecc757c455a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,6 @@ include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am -include rpc/Makefile.inc.am include test/Makefile.inc.am include hypervisor/Makefile.inc.am include esx/Makefile.inc.am @@ -272,15 +271,6 @@ GENERATED_SYM_FILES +=3D \ $(NULL) =20 =20 - -%protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ - $< $(subst $(srcdir)/,,$@) - -%protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $(subst $(srcdir)/,,$@) - check-local: check-augeas =20 check-augeas: $(augeas_DATA) $(augeastest_DATA) diff --git a/src/meson.build b/src/meson.build index 34babecd9b0..4a2998f4bfc 100644 --- a/src/meson.build +++ b/src/meson.build @@ -79,3 +79,4 @@ src_dep =3D declare_dependency( ) =20 subdir('conf') +subdir('rpc') diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am deleted file mode 100644 index fe23b17a62b..00000000000 --- a/src/rpc/Makefile.inc.am +++ /dev/null @@ -1,119 +0,0 @@ -# vim: filetype=3Dautomake - -VIR_NET_RPC_GENERATED =3D \ - rpc/virnetprotocol.h \ - rpc/virnetprotocol.c \ - rpc/virkeepaliveprotocol.h \ - rpc/virkeepaliveprotocol.c \ - $(NULL) - -noinst_LTLIBRARIES +=3D \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la \ - $(NULL) - -libvirt_la_BUILT_LIBADD +=3D \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la \ - $(NULL) - -libvirt_net_rpc_la_SOURCES =3D \ - rpc/virnetmessage.h \ - rpc/virnetmessage.c \ - rpc/virnettlscontext.h \ - rpc/virnettlscontext.c \ - rpc/virnetsocket.h \ - rpc/virnetsocket.c \ - rpc/virkeepalive.h \ - rpc/virkeepalive.c \ - $(NULL) - -nodist_libvirt_net_rpc_la_SOURCES =3D \ - $(VIR_NET_RPC_GENERATED) \ - $(NULL) - -if WITH_SSH2 -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetsshsession.h \ - rpc/virnetsshsession.c \ - $(NULL) -endif ! WITH_SSH2 - -if WITH_SASL -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetsaslcontext.h \ - rpc/virnetsaslcontext.c \ - $(NULL) -endif ! WITH_SASL - -if WITH_LIBSSH -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetlibsshsession.h \ - rpc/virnetlibsshsession.c \ - $(NULL) -endif ! WITH_LIBSSH - -libvirt_net_rpc_la_CFLAGS =3D \ - -I$(builddir)/rpc \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(SSH2_CFLAGS) \ - $(LIBSSH_CFLAGS) \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_net_rpc_la_LDFLAGS =3D \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(SSH2_LIBS)\ - $(LIBSSH_LIBS) \ - $(SECDRIVER_LIBS) \ - $(AM_LDFLAGS) \ - $(NULL) - -libvirt_net_rpc_server_la_SOURCES =3D \ - rpc/virnetserverprogram.h \ - rpc/virnetserverprogram.c \ - rpc/virnetserverservice.h \ - rpc/virnetserverservice.c \ - rpc/virnetserverclient.h \ - rpc/virnetserverclient.c \ - rpc/virnetdaemon.h \ - rpc/virnetdaemon.c \ - rpc/virnetserver.h \ - rpc/virnetserver.c \ - $(NULL) -libvirt_net_rpc_server_la_CFLAGS =3D \ - -I$(builddir)/rpc \ - $(DBUS_CFLAGS) \ - $(XDR_CFLAGS) \ - $(SASL_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_net_rpc_server_la_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(DBUS_LIBS) \ - $(NULL) - -libvirt_net_rpc_client_la_SOURCES =3D \ - rpc/virnetclientprogram.h \ - rpc/virnetclientprogram.c \ - rpc/virnetclientstream.h \ - rpc/virnetclientstream.c \ - rpc/virnetclient.h \ - rpc/virnetclient.c \ - $(NULL) -libvirt_net_rpc_client_la_CFLAGS =3D \ - -I$(builddir)/rpc \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -libvirt_net_rpc_client_la_LDFLAGS =3D $(AM_LDFLAGS) - -if WITH_SASL -libvirt_net_rpc_client_la_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL diff --git a/src/rpc/meson.build b/src/rpc/meson.build new file mode 100644 index 00000000000..b26939db9cc --- /dev/null +++ b/src/rpc/meson.build @@ -0,0 +1,108 @@ +genprotocol_prog =3D find_program('genprotocol.pl') + +rpc_sources =3D [ + 'virnetmessage.c', + 'virnettlscontext.c', + 'virnetsocket.c', + 'virkeepalive.c', +] + +if libssh_dep.found() + rpc_sources +=3D 'virnetlibsshsession.c' +endif + +if libssh2_dep.found() + rpc_sources +=3D 'virnetsshsession.c' +endif + +if sasl_dep.found() + rpc_sources +=3D 'virnetsaslcontext.c' +endif + +rpc_gen_headers =3D [] +rpc_gen_sources =3D [] + +foreach name : [ 'virnet', 'virkeepalive' ] + protocol_file =3D files('@0@protocol.x'.format(name)) + header_file =3D '@0@protocol.h'.format(name) + source_file =3D '@0@protocol.c'.format(name) + + rpc_gen_headers +=3D custom_target( + header_file, + input: protocol_file, + output: header_file, + command: [ + genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@', + ], + ) + + rpc_gen_sources +=3D custom_target( + source_file, + input: protocol_file, + output: source_file, + command: [ + genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', + ], + ) +endforeach + +rpc_server_sources =3D [ + 'virnetserverprogram.c', + 'virnetserverservice.c', + 'virnetserverclient.c', + 'virnetdaemon.c', + 'virnetserver.c', +] + +rpc_client_sources =3D [ + 'virnetclientprogram.c', + 'virnetclientstream.c', + 'virnetclient.c', +] + +virt_rpc_lib =3D static_library( + 'virt_net_rpc', + [ + rpc_sources, + rpc_gen_headers, + rpc_gen_sources, + ], + dependencies: [ + gnutls_dep, + libssh2_dep, + libssh_dep, + sasl_dep, + secdriver_dep, + src_dep, + xdr_dep, + ], +) + +virt_rpc_server_lib =3D static_library( + 'virt_net_rpc_server', + [ + rpc_server_sources, + rpc_gen_headers, + ], + dependencies: [ + dbus_dep, + sasl_dep, + src_dep, + xdr_dep, + ], +) + +virt_rpc_client_lib =3D static_library( + 'virt_net_rpc_client', + [ + rpc_client_sources, + rpc_gen_headers, + ], + dependencies: [ + sasl_dep, + src_dep, + xdr_dep, + ], +) + +rpc_inc_dir =3D include_directories('.') --=20 2.26.2