External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: drop explicit python interpreter

Browse Source 
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=header" "../src/rpc/virnetprotocol.x" "src/rpc/virnetprotocol.h"
SyntaxError: Non-UTF-8 code starting with '\x90' in file F:/msys64/ucrt64/bin/python.exe on line 1, but no encoding declared; see https://peps.python.org/pep-0263/ for details

The issue was introduced in a62486b95f commit.
These changes are similar as e06beacec2 commit.

Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
This commit is contained in:
Biswapriyo Nath 2024-01-21 06:25:57 +00:00 committed by Peter Krempa
parent 08f2add984
commit 642af05e3e
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/admin/meson.build
View File

@ -15,7 +15,7 @@ admin_protocol_h = custom_target(
output: 'admin_protocol.h', output: 'admin_protocol.h',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=header', '@INPUT@', '@OUTPUT@', '--mode=header', '@INPUT@', '@OUTPUT@',
], ],
) )
@ -27,7 +27,7 @@ admin_driver_generated += custom_target(
output: 'admin_protocol.c', output: 'admin_protocol.c',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=source', '--header=admin_protocol.h', '@INPUT@', '@OUTPUT@', '--mode=source', '--header=admin_protocol.h', '@INPUT@', '@OUTPUT@',
], ],
) )

4
src/locking/meson.build
View File

@ -20,7 +20,7 @@ lock_protocol_generated += custom_target(
output: 'lock_protocol.h', output: 'lock_protocol.h',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=header', '@INPUT@', '@OUTPUT@', '--mode=header', '@INPUT@', '@OUTPUT@',
], ],
) )
@ -31,7 +31,7 @@ lock_protocol_generated += custom_target(
output: 'lock_protocol.c', output: 'lock_protocol.c',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=source', '--header=lock_protocol.h', '@INPUT@', '@OUTPUT@', '--mode=source', '--header=lock_protocol.h', '@INPUT@', '@OUTPUT@',
], ],
) )

4
src/logging/meson.build
View File

@ -12,7 +12,7 @@ log_protocol_header_generated = custom_target(
output: 'log_protocol.h', output: 'log_protocol.h',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=header', '@INPUT@', '@OUTPUT@', '--mode=header', '@INPUT@', '@OUTPUT@',
], ],
) )
@ -24,7 +24,7 @@ log_protocol_generated += custom_target(
output: 'log_protocol.c', output: 'log_protocol.c',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=source', '--header=log_protocol.h', '@INPUT@', '@OUTPUT@', '--mode=source', '--header=log_protocol.h', '@INPUT@', '@OUTPUT@',
], ],
) )

4
src/lxc/meson.build
View File

@ -23,7 +23,7 @@ lxc_monitor_protocol_generated += custom_target(
output: 'lxc_monitor_protocol.h', output: 'lxc_monitor_protocol.h',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=header', '@INPUT@', '@OUTPUT@', '--mode=header', '@INPUT@', '@OUTPUT@',
] ]
) )
@ -34,7 +34,7 @@ lxc_monitor_protocol_generated += custom_target(
output: 'lxc_monitor_protocol.c', output: 'lxc_monitor_protocol.c',
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=source', '--header=lxc_monitor_protocol.h', '@INPUT@', '@OUTPUT@', '--mode=source', '--header=lxc_monitor_protocol.h', '@INPUT@', '@OUTPUT@',
], ],
) )

4
src/remote/meson.build
View File

@ -27,7 +27,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
output: protocol_h, output: protocol_h,
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=header', '@INPUT@', '@OUTPUT@', '--mode=header', '@INPUT@', '@OUTPUT@',
], ],
) )
@ -38,7 +38,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
output: protocol_c, output: protocol_c,
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=source', '--header=' + protocol_h, '@INPUT@', '@OUTPUT@', '--mode=source', '--header=' + protocol_h, '@INPUT@', '@OUTPUT@',
], ],
) )

4
src/rpc/meson.build
View File

@ -54,7 +54,7 @@ foreach name : [ 'virnet', 'virkeepalive' ]
output: header_file, output: header_file,
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=header', '@INPUT@', '@OUTPUT@', '--mode=header', '@INPUT@', '@OUTPUT@',
], ],
) )
@ -65,7 +65,7 @@ foreach name : [ 'virnet', 'virkeepalive' ]
output: source_file, output: source_file,
depend_files: rpcgen_src, depend_files: rpcgen_src,
command: [ command: [
meson_python_prog, python3_prog, rpcgen_prog, rpcgen_prog,
'--mode=source', '--header=' + header_file, '@INPUT@', '@OUTPUT@', '--mode=source', '--header=' + header_file, '@INPUT@', '@OUTPUT@',
], ],
) )