From nobody Wed May 15 16:07:01 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705917173938964.7626225689892; Mon, 22 Jan 2024 01:52:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id A3BC91B8D; Mon, 22 Jan 2024 04:52:52 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5D8C51A67; Mon, 22 Jan 2024 04:50:44 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 661241A49; Mon, 22 Jan 2024 04:50:39 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9FEA11A50 for ; Mon, 22 Jan 2024 04:50:38 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-186-DYQRD2uXP1qDcD0BCeLELw-1; Mon, 22 Jan 2024 04:50:36 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F1BD688F5A3 for ; Mon, 22 Jan 2024 09:50:35 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5182DC2E1E6 for ; Mon, 22 Jan 2024 09:50:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: DYQRD2uXP1qDcD0BCeLELw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH pushed] meson: drop explicit python interpreter Date: Mon, 22 Jan 2024 10:50:34 +0100 Message-ID: <642af05e3e58b90cb9d15936678f16bd7e454d26.1705916955.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: QF6M5CZBPJTDU3C2ZHRRGKN6U7SPRXP3 X-Message-ID-Hash: QF6M5CZBPJTDU3C2ZHRRGKN6U7SPRXP3 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705917177090100001 From: Biswapriyo Nath meson wraps python scripts already on win32, so we end up with these failing commands: [185/868] Generating src/rpc/virnetprotocol.h with a custom command FAILED: src/rpc/virnetprotocol.h "sh" "libvirt/scripts/meson-python.sh" "F:/msys64/ucrt64/bin/python3.EXE" "= F:/msys64/ucrt64/bin/python.exe" "libvirt/scripts/rpcgen/main.py" "--mode= =3Dheader" "../src/rpc/virnetprotocol.x" "src/rpc/virnetprotocol.h" SyntaxError: Non-UTF-8 code starting with '\x90' in file F:/msys64/ucrt64/b= in/python.exe on line 1, but no encoding declared; see https://peps.python.= org/pep-0263/ for details The issue was introduced in a62486b95feed2cf17ce4adbe794a1ecff9ef22a commit. These changes are similar as e06beacec2f8e57bbc5cd8f6eb9d44a1f291966d commi= t. Signed-off-by: Biswapriyo Nath --- Merged via MR: https://gitlab.com/libvirt/libvirt/-/merge_requests/317 src/admin/meson.build | 4 ++-- src/locking/meson.build | 4 ++-- src/logging/meson.build | 4 ++-- src/lxc/meson.build | 4 ++-- src/remote/meson.build | 4 ++-- src/rpc/meson.build | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/admin/meson.build b/src/admin/meson.build index ca2a475a6f..307c1c7a3a 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -15,7 +15,7 @@ admin_protocol_h =3D custom_target( output: 'admin_protocol.h', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dheader', '@INPUT@', '@OUTPUT@', ], ) @@ -27,7 +27,7 @@ admin_driver_generated +=3D custom_target( output: 'admin_protocol.c', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dsource', '--header=3Dadmin_protocol.h', '@INPUT@', '@OUTPUT@= ', ], ) diff --git a/src/locking/meson.build b/src/locking/meson.build index c661389178..c3dfcf2961 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -20,7 +20,7 @@ lock_protocol_generated +=3D custom_target( output: 'lock_protocol.h', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dheader', '@INPUT@', '@OUTPUT@', ], ) @@ -31,7 +31,7 @@ lock_protocol_generated +=3D custom_target( output: 'lock_protocol.c', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dsource', '--header=3Dlock_protocol.h', '@INPUT@', '@OUTPUT@', ], ) diff --git a/src/logging/meson.build b/src/logging/meson.build index 0e0cc7ab76..67eeacce43 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -12,7 +12,7 @@ log_protocol_header_generated =3D custom_target( output: 'log_protocol.h', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dheader', '@INPUT@', '@OUTPUT@', ], ) @@ -24,7 +24,7 @@ log_protocol_generated +=3D custom_target( output: 'log_protocol.c', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dsource', '--header=3Dlog_protocol.h', '@INPUT@', '@OUTPUT@', ], ) diff --git a/src/lxc/meson.build b/src/lxc/meson.build index edb88a71cb..bf9afabc0f 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -23,7 +23,7 @@ lxc_monitor_protocol_generated +=3D custom_target( output: 'lxc_monitor_protocol.h', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dheader', '@INPUT@', '@OUTPUT@', ] ) @@ -34,7 +34,7 @@ lxc_monitor_protocol_generated +=3D custom_target( output: 'lxc_monitor_protocol.c', depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dsource', '--header=3Dlxc_monitor_protocol.h', '@INPUT@', '@O= UTPUT@', ], ) diff --git a/src/remote/meson.build b/src/remote/meson.build index 16b903fcaf..681c709823 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -27,7 +27,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] output: protocol_h, depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dheader', '@INPUT@', '@OUTPUT@', ], ) @@ -38,7 +38,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] output: protocol_c, depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dsource', '--header=3D' + protocol_h, '@INPUT@', '@OUTPUT@', ], ) diff --git a/src/rpc/meson.build b/src/rpc/meson.build index d58f3caaf5..9d98bc6259 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -54,7 +54,7 @@ foreach name : [ 'virnet', 'virkeepalive' ] output: header_file, depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dheader', '@INPUT@', '@OUTPUT@', ], ) @@ -65,7 +65,7 @@ foreach name : [ 'virnet', 'virkeepalive' ] output: source_file, depend_files: rpcgen_src, command: [ - meson_python_prog, python3_prog, rpcgen_prog, + rpcgen_prog, '--mode=3Dsource', '--header=3D' + header_file, '@INPUT@', '@OUTPUT@= ', ], ) --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org