On Mon, Jan 22, 2024 at 10:04:27 +0000, Daniel P. Berrangé wrote:
On Mon, Jan 22, 2024 at 10:50:34AM +0100, Peter Krempa wrote:
From: Biswapriyo Nath <nathbappai@gmail.com>
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 a62486b95feed2cf17ce4adbe794a1ecff9ef22a commit. These changes are similar as e06beacec2f8e57bbc5cd8f6eb9d44a1f291966d commit.
Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com> ---
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(-)
I guess this is the set which impacts wnidows builds, but we still have alot more of the problematic code pattern
$ git grep meson_python_prog docs/meson.build: meson_python_prog, python3_prog.full_path(), meson_install_web_prog.full_path(), meson.build: meson_python_prog.full_path(), python3_prog.full_path(), meson_dist_prog.full_path(), src/access/meson.build: command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@' ], src/meson.build: meson_python_prog, python3_prog, dtrace2systemtap_prog, src/meson.build: meson_python_prog, python3_prog, augeas_gentest_prog, src/meson.build: meson_python_prog, python3_prog, augeas_gentest_prog, src/meson.build: meson_python_prog, python3_prog, gensystemtap_prog, src/meson.build: meson_python_prog.full_path(), python3_prog.full_path(), meson_install_dirs_prog.full_path(), src/network/meson.build: meson_python_prog.full_path(), python3_prog.full_path(), meson_install_sy
for completeness we should cull the rest, otherwise we're bound to copy+paste the bad pattern back into something that hits on windows.
Yeah, I've noted on my todo list to ensure that meson_python_prog and python3_prog objects to be removed so that it doesn't happen again. I didn't start yet, so go ahead