From nobody Sun Feb 8 17:47:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1638977463; cv=none; d=zohomail.com; s=zohoarc; b=Fut/VSACYNOtkpqm4Bu5hySVXoVsmoIg5M/X59YrPffJlv826J83k4lZXARpu8F+jN0uXoHAMbt6tUA96V3oGKG8EcKy8zdCeRD3s9OFnZj7SeOTLA360YwMuLz3k2NMceIt5R6hXymuGnb6mAnYqC8dxnuW+spoMBloY+XcJE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638977463; 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=frrTMxkC0ccyngitJLzLrE0J0ANxbXvXVGz8EbZKFLs=; b=Hu05KDaujRy2nftKU39C+iBR1+KSMEoMwOYbjFrnvpFMzBea4QoFWIsIZNWx2idG+MW5PfKjdI7RE64lSfK0l13sJu+yYiSxRkEos+LqVURMaoGh8SGc5dsA/EnW/dUWMiTkWziyeSHiYQ8dS7+eviqrS3unONpGqmmPhAiLj8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638977463724200.9640178333383; Wed, 8 Dec 2021 07:31:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-210-h9JPdj_JOziCBsGLSzmPgw-1; Wed, 08 Dec 2021 10:31:00 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B2F41835E4E; Wed, 8 Dec 2021 15:30:54 +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 9300F45D71; Wed, 8 Dec 2021 15:30:54 +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 63EB11809CB9; Wed, 8 Dec 2021 15:30:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B8FU9Nc032173 for ; Wed, 8 Dec 2021 10:30:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 64EEA794D6; Wed, 8 Dec 2021 15:30:09 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id E065F7958B for ; Wed, 8 Dec 2021 15:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638977462; 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=frrTMxkC0ccyngitJLzLrE0J0ANxbXvXVGz8EbZKFLs=; b=P5lPU6w3RMNlmtu4mx2baxMQ2YRIcaqR1xpgOkKAXgoNXOZkAcwOSTGlUWcgAQs1OGkuI0 f0TaZZcJUsHMjXhkRZ0Ia61RJzU7HPRZZtjNx7PneORruBmd2V1qGaXGIbLt33ZXNFiUaz xckPWbov09BzoGTZaZHI+QIzyT06BiM= X-MC-Unique: h9JPdj_JOziCBsGLSzmPgw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 5/7] admin: Build only when RPC is available Date: Wed, 8 Dec 2021 16:29:07 +0100 Message-Id: <45aa04c91da22ed07a53a32828d439f00d44ca23.1638977134.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638977465571100003 Content-Type: text/plain; charset="utf-8" The admin module is very closely tied to RPC. If we are building without RPC support there's not much use for the admin module, in fact it fails to build. Signed-off-by: Michal Privoznik --- examples/c/admin/meson.build | 36 ++++++------- src/admin/meson.build | 36 ++++++------- src/meson.build | 98 ++++++++++++++++++------------------ tools/meson.build | 44 ++++++++-------- 4 files changed, 111 insertions(+), 103 deletions(-) diff --git a/examples/c/admin/meson.build b/examples/c/admin/meson.build index 094408a63c..aa7811ebe5 100644 --- a/examples/c/admin/meson.build +++ b/examples/c/admin/meson.build @@ -8,20 +8,22 @@ example_admin_files =3D [ 'threadpool_params', ] =20 -foreach name : example_admin_files - source_file =3D '@0@.c'.format(name) - executable( - name, - [ - source_file, - ], - include_directories: [ - libvirt_inc, - ], - link_with: [ - libvirt_lib, - libvirt_admin_lib, - ], - ) - install_data(source_file, install_dir: example_dir / 'c' / 'admin') -endforeach +if conf.has('WITH_REMOTE') + foreach name : example_admin_files + source_file =3D '@0@.c'.format(name) + executable( + name, + [ + source_file, + ], + include_directories: [ + libvirt_inc, + ], + link_with: [ + libvirt_lib, + libvirt_admin_lib, + ], + ) + install_data(source_file, install_dir: example_dir / 'c' / 'admin') + endforeach +endif diff --git a/src/admin/meson.build b/src/admin/meson.build index f787c6665b..130997fb87 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -91,24 +91,26 @@ libvirt_admin_syms_flags =3D '@0@@1@'.format( libvirt_admin_syms_file.full_path(), ) =20 -admin_driver_lib =3D static_library( - 'virt_admin_driver', - [ - admin_driver_sources, - admin_driver_generated, - ], - dependencies: [ - rpc_dep, - sasl_dep, - src_dep, - xdr_dep, - ], -) +if conf.has('WITH_REMOTE') + admin_driver_lib =3D static_library( + 'virt_admin_driver', + [ + admin_driver_sources, + admin_driver_generated, + ], + dependencies: [ + rpc_dep, + sasl_dep, + src_dep, + xdr_dep, + ], + ) =20 -check_protocols +=3D { - 'name': 'admin_protocol', - 'lib': admin_driver_lib, -} + check_protocols +=3D { + 'name': 'admin_protocol', + 'lib': admin_driver_lib, + } +endif =20 virt_conf_files +=3D files('libvirt-admin.conf') =20 diff --git a/src/meson.build b/src/meson.build index 2bd88e6699..2408344ef7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -517,48 +517,48 @@ libvirt_lxc_lib =3D shared_library( =20 =20 # libvirt-admin.so - -libvirt_admin_lib =3D shared_library( - 'virt-admin', - [ - admin_sources, - admin_client_generated, - admin_driver_generated, - datatypes_sources, - dtrace_gen_objects, - ], - dependencies: [ - capng_dep, - devmapper_dep, - gnutls_dep, - libssh2_dep, - libssh_dep, - sasl_dep, - src_dep, - rpc_dep, - xdr_dep, - yajl_dep, - ], - include_directories: [ - admin_inc_dir, - remote_inc_dir, - ], - link_args: [ - libvirt_admin_syms_flags, - libvirt_nodelete, - ], - link_with: [ - libvirt_lib, - ], - link_depends: [ - libvirt_admin_syms_file, - ], - install: true, - install_rpath: libvirt_rpath, - version: libvirt_lib_version, - soversion: libvirt_so_version, -) - +if conf.has('WITH_REMOTE') + libvirt_admin_lib =3D shared_library( + 'virt-admin', + [ + admin_sources, + admin_client_generated, + admin_driver_generated, + datatypes_sources, + dtrace_gen_objects, + ], + dependencies: [ + capng_dep, + devmapper_dep, + gnutls_dep, + libssh2_dep, + libssh_dep, + sasl_dep, + src_dep, + rpc_dep, + xdr_dep, + yajl_dep, + ], + include_directories: [ + admin_inc_dir, + remote_inc_dir, + ], + link_args: [ + libvirt_admin_syms_flags, + libvirt_nodelete, + ], + link_with: [ + libvirt_lib, + ], + link_depends: [ + libvirt_admin_syms_file, + ], + install: true, + install_rpath: libvirt_rpath, + version: libvirt_lib_version, + soversion: libvirt_so_version, + ) +endif =20 # build libvirt shared modules =20 @@ -919,12 +919,14 @@ if host_machine.system() =3D=3D 'linux' env: runutf8, ) =20 - test( - 'check-admin-symfile', - python3_prog, - args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin_l= ib ], - env: runutf8, - ) + if conf.has('WITH_REMOTE') + test( + 'check-admin-symfile', + python3_prog, + args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin= _lib ], + env: runutf8, + ) + endif endif =20 test( diff --git a/tools/meson.build b/tools/meson.build index 3fba313e5f..22fa3604ba 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -206,27 +206,29 @@ executable( install_rpath: libvirt_rpath, ) =20 -executable( - 'virt-admin', - [ - 'virt-admin.c', - 'virt-admin-completer.c', - ], - dependencies: [ - tools_dep, - readline_dep, - ], - link_args: [ - coverage_flags, - ], - link_with: [ - libvirt_admin_lib, - libvirt_shell_lib, - ], - install: true, - install_dir: bindir, - install_rpath: libvirt_rpath, -) +if conf.has('WITH_REMOTE') + executable( + 'virt-admin', + [ + 'virt-admin.c', + 'virt-admin-completer.c', + ], + dependencies: [ + tools_dep, + readline_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_admin_lib, + libvirt_shell_lib, + ], + install: true, + install_dir: bindir, + install_rpath: libvirt_rpath, + ) +endif =20 tools_conf =3D configuration_data() tools_conf.set('PACKAGE', meson.project_name()) --=20 2.32.0