From nobody Sun Feb 8 14:41:53 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=1594894120; cv=none; d=zohomail.com; s=zohoarc; b=AoPhyqqZBwXnUvtUysAYz2SdjJsV2AWlYYVAIekqldprTPCVU+SXDLrW/HaP2ZOBpRYokF/ObH4eJGuVyWu16ZAWwp+kJ0KizLNQecmth9+66iQZsQi1fvW8OJEeI6s0yBAx/nruNTuhtsQ7yyViYQqveF30DPyJDsvoJaB9TsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894120; 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=hJuIaTdhqdvg58a3StlfVoAUSazIeUJoDLa5uxU2ztE=; b=nev7l4uZX9CuCcXllfB97d/lR1wBWG84fPubLzCX9sauibkdpddjUWTf0++iQBwaKWYInvNk38JpxurULS7O7/DW/tf0Gt1uhu+LlOjEQEIlfZu80Iow2VZrt9nTjmK62+I8yv74+XoZMhftZir45cz/RWoTKtK3InNQ8wRmGVY= 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 1594894120334461.6519991702364; Thu, 16 Jul 2020 03:08:40 -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-296-YrgthT4QNcWAmA4pqS1h0w-1; Thu, 16 Jul 2020 06:08:34 -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 AB81480BCBB; Thu, 16 Jul 2020 10:08:27 +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 3C1877BEDE; Thu, 16 Jul 2020 10:08:27 +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 020C4730E0; Thu, 16 Jul 2020 10:08:27 +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 06GA5bUg018574 for ; Thu, 16 Jul 2020 06:05:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A2372B6DC; Thu, 16 Jul 2020 10:05:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 995022B6DB for ; Thu, 16 Jul 2020 10:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894119; 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=hJuIaTdhqdvg58a3StlfVoAUSazIeUJoDLa5uxU2ztE=; b=SJMv3IFSW2+aYzAQCp2n4CJ1jifTjOt+ZltpNvs8OnShiQa6y9NgS4OOAaC8lH6IoQiKwl OgL2hiiTUPPfk42fby5jGgJiFOsATeO6/7AMv3bHbMlmFZ4DA4A6BWRL7BAMXonK6WVcDO QAUVIo0gBGsBvbyNLdsCv5iJBftl0R4= X-MC-Unique: YrgthT4QNcWAmA4pqS1h0w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 221/351] meson: src: build libvirt_iohelper binary Date: Thu, 16 Jul 2020 11:57:37 +0200 Message-Id: <36d826bd798c83c05215935fc98150095e37cde6.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.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/Makefile.am | 24 ------------------------ src/util/Makefile.inc.am | 3 --- src/util/meson.build | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 src/util/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8760fdf3a22..99bb71e6a03 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,7 +34,6 @@ conf_DATA =3D if WITH_DTRACE_PROBES tapset_DATA =3D endif WITH_DTRACE_PROBES -libexec_PROGRAMS =3D RPC_PROBE_FILES =3D LOGROTATE_FILES_IN =3D SYSTEMD_UNIT_FILES =3D @@ -50,7 +49,6 @@ COMMON_UNIT_VARS =3D \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ $(NULL) =20 -include util/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am @@ -336,28 +334,6 @@ endif LIBVIRT_INIT_SCRIPT_OPENRC endif WITH_LIBVIRTD =20 =20 -if WITH_LIBVIRTD -libexec_PROGRAMS +=3D libvirt_iohelper -libvirt_iohelper_SOURCES =3D $(UTIL_IO_HELPER_SOURCES) -libvirt_iohelper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_iohelper_LDADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -libvirt_iohelper_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_iohelper_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(NULL) - - -endif WITH_LIBVIRTD - - install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am deleted file mode 100644 index 879b3d9e398..00000000000 --- a/src/util/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -UTIL_IO_HELPER_SOURCES =3D util/iohelper.c diff --git a/src/util/meson.build b/src/util/meson.build index 3c728b355ee..af60283cbc7 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -168,6 +168,10 @@ foreach name : keyname_list ) endforeach =20 +io_helper_sources =3D [ + 'iohelper.c', +] + virt_util_lib =3D static_library( 'virt_util', [ @@ -195,4 +199,14 @@ virt_util_lib =3D static_library( =20 libvirt_libs +=3D virt_util_lib =20 +if conf.has('WITH_LIBVIRTD') + virt_helpers +=3D { + 'name': 'libvirt_iohelper', + 'sources': [ + files(io_helper_sources), + dtrace_gen_headers, + ], + } +endif + util_inc_dir =3D include_directories('.') --=20 2.26.2