From nobody Sun Feb 8 11:59:31 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=1594894104; cv=none; d=zohomail.com; s=zohoarc; b=O71VKu4SDVUt7wisT3Lg+D6HTZ12tC67XOQTCoHem3c9bWTHvdVsSf/hmNVkfTm2ZB8tkhU9eHjseHAVhq3O4iR98sP3SeHYpj2TOtr7TD8aRsIKrOMBJOCcu6n/gB3QLXZ5eH0+Xm3VbCG7j8DzVvxDtIok3HS0zqSrQPDpPZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894104; 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=mjlT9sOw+4OE3ACe+3TtoNlYvGW2FSRLpzGxVhmBdMo=; b=DHtFUrz4XkMl+Qnp42hmqyYomOT3kLHHP4vM+gFtvaq4Z7nL3PwEuFblQxDIl7ocbguZoo8smeKSLaxb3PgWdKJvpkkUVvy8/b5XRgzumROqFK6K0e0qK8l2iiBrso6jDaxvfjGf9Qtt4q8MCkr6Hqfqul4R/UhK8W2lZ3kr3a0= 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894104220659.9088004635563; Thu, 16 Jul 2020 03:08:24 -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-494-Qg3m1nBdO7iTWjWeHizz7g-1; Thu, 16 Jul 2020 06:08:20 -0400 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 4795D100AA22; Thu, 16 Jul 2020 10:08:14 +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 28FA1724A9; Thu, 16 Jul 2020 10:08:14 +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 EC56E730C3; Thu, 16 Jul 2020 10:08:13 +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 06GA3UtW017243 for ; Thu, 16 Jul 2020 06:03:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id A2E1E2B6DC; Thu, 16 Jul 2020 10:03:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DD122B6DB for ; Thu, 16 Jul 2020 10:03:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894103; 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=mjlT9sOw+4OE3ACe+3TtoNlYvGW2FSRLpzGxVhmBdMo=; b=Wy7zUnAhnoqjVYdCKKk30NB/sYhDwV36sZi/Sem3nwdJKLH4Gz8v/+aBdPG2ba3pKeFlcC TrOg8rK+9yJYicg5zK3cPRjkSweNehfusM7fv3POa/7l21qbQUwGne6mlVfAmEAC08butZ UsYHTOl95aTu/Lk/jI45eFRXXiAY5To= X-MC-Unique: Qg3m1nBdO7iTWjWeHizz7g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 129/351] meson: src: build dtrace files Date: Thu, 16 Jul 2020 11:56:05 +0200 Message-Id: <3c277412c1bdf27d3f25f96d8693299cdaa2effb.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.11 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/meson.build | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4eed047926d..4c0ef6283a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -400,24 +400,7 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_probes.lo libvirt_la_DEPENDENCIES +=3D libvirt_probes.lo libvirt_probes.o nodist_libvirt_la_SOURCES =3D libvirt_probes.h =20 -tapsetdir =3D $(datadir)/systemtap/tapset -tapset_DATA +=3D libvirt_probes.stp libvirt_functions.stp - -%_probes.h: %_probes.d - $(AM_V_GEN)$(DTRACE) -o $@ -h -s $< - -.PRECIOUS: %_probes.o -%_probes.o: %_probes.d - $(AM_V_GEN)$(DTRACE) -o $@ -G -s $< - -%_probes.lo: %_probes.o - $(AM_V_GEN)printf %s\\n \ - '# $@ - a libtool object file' \ - '# Generated by libtool (GNU libtool) 2.4' \ - '# Actually generated by Makefile.am, in order to shut up libtool' \ - "pic_object=3D'$<'" \ - "non_pic_object=3D'$<'" \ - > $@ +tapset_DATA +=3D libvirt_functions.stp =20 # Keep this list synced with PROTOCOL_STRUCTS RPC_PROBE_FILES +=3D $(srcdir)/rpc/virnetprotocol.x \ @@ -431,11 +414,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/gensystemtap.py \ $(RPC_PROBE_FILES) > $@ =20 -%_probes.stp: %_probes.d $(top_srcdir)/scripts/dtrace2systemtap.py \ - $(top_builddir)/config.status - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/dtrace2systemtap.py= \ - $(bindir) $(sbindir) $(libdir) $< > $@ - endif WITH_DTRACE_PROBES =20 libvirt_qemu_la_SOURCES =3D libvirt-qemu.c diff --git a/src/meson.build b/src/meson.build index 453691dc902..9796d344b4a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -28,3 +28,42 @@ endif if conf.has('WITH_SECDRIVER_APPARMOR') secdriver_dep +=3D apparmor_dep endif + + +# generate systemtap files + +systemtap_dir =3D datadir / 'systemtap' / 'tapset' + +dtrace_gen_headers =3D [] +dtrace_gen_objects =3D [] + +if conf.has('WITH_DTRACE_PROBES') + infile =3D 'libvirt_probes.d' + out_h =3D 'libvirt_probes.h' + out_o =3D 'libvirt_probes.o' + out_stp =3D 'libvirt_probes.stp' + + dtrace_gen_headers +=3D custom_target( + out_h, + input: infile, + output: out_h, + command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ], + ) + + dtrace_gen_objects +=3D custom_target( + out_o, + input: infile, + output: out_o, + command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ], + ) + + custom_target( + out_stp, + input: infile, + output: out_stp, + command: [ meson_python_prog, dtrace2systemtap_prog, bindir, sbindir, = libdir, '@INPUT@' ], + capture: true, + install: true, + install_dir: systemtap_dir, + ) +endif --=20 2.26.2