On 10/01/2023 09.02, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> On msys2, the shader-to-C script produces bad C:
> ./ui/shader/texture-blit-vert.h:2:5: error: missing terminating " character [-Werror]
>
> Fix it by changing the line ending from crlf to lf, and convert the
> script to Python (qemu build seems perl-free after that).
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Acked-by: Thomas Huth <thuth@redhat.com>
> ---
> meson.build | 2 +-
> scripts/shaderinclude.pl | 16 ----------------
> scripts/shaderinclude.py | 26 ++++++++++++++++++++++++++
> 3 files changed, 27 insertions(+), 17 deletions(-)
> delete mode 100644 scripts/shaderinclude.pl
> create mode 100755 scripts/shaderinclude.py
This seems to break our "make vm-build-freebsd" test... I'm now getting:
[281/1485] Generating ui/shader/texture-blit-frag.h with a custom command
(wrapped by meson to capture output)
FAILED: ui/shader/texture-blit-frag.h
/usr/local/bin/python3.7 /usr/home/qemu/qemu-test.SnknY0/src/meson/meson.py
--internal exe --capture ui/shader/texture-blit-frag.h --
/usr/home/qemu/qemu-test.SnknY0/src/scripts/shaderinclude.py
../src/ui/shader/texture-blit.frag
--- stderr ---
env: python3: No such file or directory
Looks like you've got to do "chmod a-x scripts/shaderinclude.py" to get this
fixed, after removing the executable bits, I'm getting:
[281/1485] Generating ui/shader/texture-blit-frag.h with a custom command
(wrapped by meson to capture output)
and the compilation process continues happily.
thanks for the tip, indeed since 0.51 "find_program: use Meson's Python3 for non-executable Python scripts":
It's a bit annoying to have a mix of executable and non-executable scripts/*.py, but python.., oh well.. I suppose the ones used during build are -x, the one used manually are
+x.