From nobody Tue May 7 12:18:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1604936306; cv=none; d=zohomail.com; s=zohoarc; b=Oc7tfpdfs5DLn7t+hzAoXQpbt/kNUnNFntpyoHfRmnnc+Qs1uYelY2+uOM0p8lM7sr5LkvVoKDnIBA9rIVkVSXGmJM8GZWDEjkLZ1MoQb9jwvc9fXpf0s8PeV+vr6A451BsFBRxysfPJz9kmby5NEGZCWEtlcui/tCquOv7S7rY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604936306; 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=XfnUcynHW8h0NCx2+/u45/OPIrE69y0uQ6vzRXKpoOc=; b=lAiVXjrNAmk7I9+WZe+aTFWlDMXpIM3MkPC9BnClAPRfYH53UlEI/tykQZ2sHOUZW562aQPsDX2toFmlpCI+bnslhi/Ep7jCKiOzYzvLwwRXJNlOGi9MfFLX2VxhA6nIP3lk1wfezYOPa57y74XwiZq1FGOCygzjlqqB8Yva7xg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604936306491414.8973392382229; Mon, 9 Nov 2020 07:38:26 -0800 (PST) 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-306-Lw4vSYXIPmu1fvZPE6B8tA-1; Mon, 09 Nov 2020 10:38:23 -0500 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 67B50186DD42; Mon, 9 Nov 2020 15:38:17 +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 19C48672C0; Mon, 9 Nov 2020 15:38:17 +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 B3EA1CF6D; Mon, 9 Nov 2020 15:38:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A9Fc3Hl008739 for ; Mon, 9 Nov 2020 10:38:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6F92B55761; Mon, 9 Nov 2020 15:38:03 +0000 (UTC) Received: from fedora.redhat.com (ovpn-114-194.ams2.redhat.com [10.36.114.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id A11545577A; Mon, 9 Nov 2020 15:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604936305; 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=XfnUcynHW8h0NCx2+/u45/OPIrE69y0uQ6vzRXKpoOc=; b=cw1jUpc3uwRO9hor5T9ZFkDzQdDbP8Ppja8mwJdQUbZbuoTrfVVBjoYT0O29fYE4Tv7Its Erd201+SUUj7DPbDpszZnnfSKU37RP4nxyfOt5je3hP/MFrPIHvoc0PpHDw2Ln0JV+fLsx 4xKF7NZilmRhuHoPI28EH7lVB4UxylE= X-MC-Unique: Lw4vSYXIPmu1fvZPE6B8tA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] meson: ensure python script is run in utf8 env Date: Mon, 9 Nov 2020 15:37:54 +0000 Message-Id: <20201109153755.805957-2-berrange@redhat.com> In-Reply-To: <20201109153755.805957-1-berrange@redhat.com> References: <20201109153755.805957-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 29c8210ab2..72dad0ab45 100644 --- a/src/meson.build +++ b/src/meson.build @@ -703,7 +703,7 @@ endforeach =20 foreach data : virt_daemon_confs capitalize_args =3D [ '-c', 'print("@0@".capitalize())'.format(data['nam= e']) ] - name_uc =3D run_command(python3_prog, capitalize_args, check: true).stdo= ut().strip() + name_uc =3D run_command(python3_prog, capitalize_args, check: true, env:= runutf8).stdout().strip() daemon_conf =3D configuration_data() daemon_conf.set('runstatedir', runstatedir) daemon_conf.set('sbindir', sbindir) --=20 2.28.0 From nobody Tue May 7 12:18:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1604936314; cv=none; d=zohomail.com; s=zohoarc; b=PpX72E6t4FgXFVrJ2Ha/65CqkMc5L7s8WNZ3eQB8o/JQBu9V+lUO60UADP1Eg6vq+PMwqDzQC/m3U76F38KAP00OHKpWZQBQlMN073zruyiekmc3kEAOLKbfAhlJ95DPcvskmuUMfh1SVeLG8TXzuK7//ShGhtBCwzFfqCf/458= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604936314; 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=RsomvVSvFY7au3LS91oecquJPvFGMqv7JwdkYgfr+tM=; b=LtBBmZ58/+Fw4duMs6hM+rLcXSs1xRoG5yZTShwqGW1zwTmHIKOQuSROfeR9ZcLU8JPhJdwHkqnsYYVr1ZLKy2HnoQiD1Wa5NK6//HFciAH/Ef/tJzS0mda8LXZeg5q192bV8Kw1+6zYitWNqvpo6w3TkMPu9+BPyPA4IZ4JF00= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604936314081884.2010426634046; Mon, 9 Nov 2020 07:38:34 -0800 (PST) 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-159-XSqHZiabN6S2eXv0E7t3Fw-1; Mon, 09 Nov 2020 10:38:28 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C70088030DC; Mon, 9 Nov 2020 15:38:20 +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 9DFB05C5FD; Mon, 9 Nov 2020 15:38:20 +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 678A744A43; Mon, 9 Nov 2020 15:38:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A9Fc6B9008754 for ; Mon, 9 Nov 2020 10:38:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 08DC25578F; Mon, 9 Nov 2020 15:38:06 +0000 (UTC) Received: from fedora.redhat.com (ovpn-114-194.ams2.redhat.com [10.36.114.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3F8455760; Mon, 9 Nov 2020 15:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604936313; 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=RsomvVSvFY7au3LS91oecquJPvFGMqv7JwdkYgfr+tM=; b=i/rT7jeTPiO0EYxY77aigwGPG82rSOsLfvVL6ay3+EiC20IloqRx9VsyPvvI9xsL8HV8Dp DV51atyoLvt4XYsCnQzCpvUt0p5u4BNM0rM6edJkHLS0b6VWWkAcHizaN6ELpELsjx5qZq y2H4VoZ72hCUdV4PFBknqGgZM+v2rY0= X-MC-Unique: XSqHZiabN6S2eXv0E7t3Fw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] meson: drop use of .path() for python args Date: Mon, 9 Nov 2020 15:37:55 +0000 Message-Id: <20201109153755.805957-3-berrange@redhat.com> In-Reply-To: <20201109153755.805957-1-berrange@redhat.com> References: <20201109153755.805957-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.16 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) When using .path() for an argument to a python script meson will not setup dependancies on the file. This means that changes to the generator script will not trigger a rebiuld Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- docs/manpages/meson.build | 4 ++-- docs/meson.build | 8 ++++---- src/access/meson.build | 2 +- src/admin/meson.build | 4 ++-- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/meson.build | 16 ++++++++-------- src/qemu/meson.build | 2 +- src/util/meson.build | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index ecc517e80e..7156c10cc6 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -32,7 +32,7 @@ foreach name : keycode_list input: keymap_src_file, output: 'virkeycode-@0@.rst'.format(name), command: [ - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'cod= e-docs', + meson_python_prog, python3_prog, keymap_gen_prog, 'code-docs', '--lang', 'rst', '--title', 'virkeycode-@0@'.format(name), '--subtitle', 'Key code values for @0@'.format(name), @@ -53,7 +53,7 @@ foreach name : keyname_list input: keymap_src_file, output: 'virkeyname-@0@.rst'.format(name), command: [ - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'nam= e-docs', + meson_python_prog, python3_prog, keymap_gen_prog, 'name-docs', '--lang', 'rst', '--title', 'virkeyname-@0@'.format(name), '--subtitle', 'Key name values for @0@'.format(name), diff --git a/docs/meson.build b/docs/meson.build index a915d6252a..28914f76f9 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -140,7 +140,7 @@ aclperms_gen =3D custom_target( input: access_perm_h, output: 'aclperms.htmlinc', command: [ - meson_python_prog, python3_prog.path(), genaclperms_prog.path(), '@INP= UT@', + meson_python_prog, python3_prog, genaclperms_prog, '@INPUT@', ], capture: true, ) @@ -163,7 +163,7 @@ docs_api_generated =3D custom_target( 'libvirt-admin-api.xml', ], command: [ - meson_python_prog, python3_prog.path(), apibuild_prog.path(), + meson_python_prog, python3_prog, apibuild_prog, meson.current_source_dir(), meson.current_build_dir(), ], @@ -233,8 +233,8 @@ hvsupport_html_in =3D custom_target( output: 'hvsupport.html.in', command: [ meson_python_prog, - python3_prog.path(), - hvsupport_prog.path(), + python3_prog, + hvsupport_prog, meson.source_root(), meson.build_root(), ], diff --git a/src/access/meson.build b/src/access/meson.build index 1cffdae21a..36aff6fd88 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -82,7 +82,7 @@ if conf.has('WITH_POLKIT') 'org.libvirt.api.policy', input: access_perm_h, output: 'org.libvirt.api.policy', - command: [ meson_python_prog, python3_prog.path(), genpolkit_prog.pa= th(), '@INPUT@' ], + command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@= ' ], capture: true, install: true, install_dir: datadir / 'polkit-1' / 'actions', diff --git a/src/admin/meson.build b/src/admin/meson.build index e97974231f..f787c6665b 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -68,7 +68,7 @@ libvirt_admin_syms =3D custom_target( ], output: 'libvirt_admin.syms', command: [ - meson_python_prog, python3_prog.path(), meson_gen_sym_prog.path(), + meson_python_prog, python3_prog, meson_gen_sym_prog, '@OUTPUT@', 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_version(), '@INPU= T@', ], ) @@ -79,7 +79,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_admin_syms, output: 'libvirt_admin.def', command: [ - meson_python_prog, python3_prog.path(), meson_gen_def_prog.path(), + meson_python_prog, python3_prog, meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) diff --git a/src/esx/meson.build b/src/esx/meson.build index 2a7fcd54c9..5861e90afa 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -25,7 +25,7 @@ esx_gen_headers =3D custom_target( 'esx_vi_types.generated.typeenum', ], command: [ - meson_python_prog, python3_prog.path(), esx_vi_generator_prog.path(), + meson_python_prog, python3_prog, esx_vi_generator_prog, meson.source_root() / 'src', meson.build_root() / 'src', 'header', @@ -46,7 +46,7 @@ esx_gen_sources =3D custom_target( 'esx_vi_types.generated.typetostring', ], command: [ - meson_python_prog, python3_prog.path(), esx_vi_generator_prog.path(), + meson_python_prog, python3_prog, esx_vi_generator_prog, meson.source_root() / 'src', meson.build_root() / 'src', 'source', diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build index 84fcedce38..1020e3d6b0 100644 --- a/src/hyperv/meson.build +++ b/src/hyperv/meson.build @@ -16,7 +16,7 @@ hyperv_gen_sources =3D custom_target( 'hyperv_wmi_classes.generated.typedef', ], command: [ - meson_python_prog, python3_prog.path(), hyperv_wmi_generator_prog.path= (), + meson_python_prog, python3_prog, hyperv_wmi_generator_prog, meson.source_root() / 'src', meson.build_root() / 'src', ], diff --git a/src/meson.build b/src/meson.build index 72dad0ab45..7c478219d6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -75,7 +75,7 @@ if conf.has('WITH_DTRACE_PROBES') input: infile, output: out_stp, command: [ - meson_python_prog, python3_prog.path(), dtrace2systemtap_prog.path(), + meson_python_prog, python3_prog, dtrace2systemtap_prog, bindir, sbindir, libdir, '@INPUT@' ], capture: true, @@ -356,7 +356,7 @@ libvirt_syms =3D custom_target( input: [ public_sym_file ] + used_sym_files + generated_sym_files, output: 'libvirt.syms', command: [ - meson_python_prog, python3_prog.path(), meson_gen_sym_prog.path(), + meson_python_prog, python3_prog, meson_gen_sym_prog, '@OUTPUT@', 'LIBVIRT_PRIVATE_' + meson.project_version(), '@INPUT@', ], ) @@ -367,7 +367,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_syms, output: 'libvirt.def', command: [ - meson_python_prog, python3_prog.path(), meson_gen_def_prog.path(), + meson_python_prog, python3_prog, meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) @@ -417,7 +417,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_qemu_syms, output: 'libvirt_qemu.def', command: [ - meson_python_prog, python3_prog.path(), meson_gen_def_prog.path(), + meson_python_prog, python3_prog, meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) @@ -471,7 +471,7 @@ if host_machine.system() =3D=3D 'windows' input: libvirt_lxc_syms, output: 'libvirt_lxc.def', command: [ - meson_python_prog, python3_prog.path(), meson_gen_def_prog.path(), + meson_python_prog, python3_prog, meson_gen_def_prog, '@INPUT@', '@OUTPUT@', ], ) @@ -686,7 +686,7 @@ foreach data : virt_test_aug_files input: [ data['conf'], data['aug'] ], output: data['name'], command: [ - meson_python_prog, python3_prog.path(), augeas_gentest_prog.path(), + meson_python_prog, python3_prog, augeas_gentest_prog, '@INPUT@', ], capture: true, @@ -762,7 +762,7 @@ foreach data : virt_daemon_confs input: [ conf_out, test_aug_tmp ], output: test_aug_out, command: [ - meson_python_prog, python3_prog.path(), augeas_gentest_prog.path(), + meson_python_prog, python3_prog, augeas_gentest_prog, '@INPUT@', ], capture: true, @@ -884,7 +884,7 @@ if conf.has('WITH_DTRACE_PROBES') input: rpc_probe_files, output: 'libvirt_functions.stp', command: [ - meson_python_prog, python3_prog.path(), gensystemtap_prog.path(), + meson_python_prog, python3_prog, gensystemtap_prog, '@INPUT@', ], capture: true, diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 4e599d1e69..90640b03c6 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -71,7 +71,7 @@ if conf.has('WITH_DTRACE_PROBES') input: infile, output: out_stp, command: [ - meson_python_prog, python3_prog.path(), dtrace2systemtap_prog.path(), + meson_python_prog, python3_prog, dtrace2systemtap_prog, bindir, sbindir, libdir, '@INPUT@', ], capture: true, diff --git a/src/util/meson.build b/src/util/meson.build index 3b711b1dc2..395e70fd38 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -144,7 +144,7 @@ foreach name : keycode_list input: keymap_src_file, output: 'virkeycodetable_@0@.h'.format(name), command: [ - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'cod= e-table', + meson_python_prog, python3_prog, keymap_gen_prog, 'code-table', '--lang', 'stdc', '--varname', 'virKeyCodeTable_@0@'.format(name), '@INPUT@', name, @@ -159,7 +159,7 @@ foreach name : keyname_list input: keymap_src_file, output: 'virkeynametable_@0@.h'.format(name), command: [ - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'nam= e-table', + meson_python_prog, python3_prog, keymap_gen_prog, 'name-table', '--lang', 'stdc', '--varname', 'virKeyNameTable_@0@'.format(name), '@INPUT@', name, --=20 2.28.0