[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 1/8] build-sys: fix crlf-ending C code
From: |
Thomas Huth |
Subject: |
Re: [PATCH v3 1/8] build-sys: fix crlf-ending C code |
Date: |
Tue, 10 Jan 2023 09:33:23 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 |
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.
Thomas
- [PATCH v3 0/8] Fix win32/msys2 shader compilation & update lcitool deps, marcandre . lureau, 2023/01/10
- [PATCH v3 1/8] build-sys: fix crlf-ending C code, marcandre . lureau, 2023/01/10
- Re: [PATCH v3 1/8] build-sys: fix crlf-ending C code,
Thomas Huth <=
- [PATCH v3 2/8] .gitlab-ci.d/windows: do not disable opengl, marcandre . lureau, 2023/01/10
- [PATCH v3 3/8] configure: replace Perl usage with sed, marcandre . lureau, 2023/01/10
- [PATCH v3 4/8] meson: replace Perl usage with Python, marcandre . lureau, 2023/01/10
- [PATCH v3 5/8] docs: drop texinfo options, marcandre . lureau, 2023/01/10
- [PATCH v3 6/8] Update lcitool and fedora to 37, marcandre . lureau, 2023/01/10
- [PATCH v3 7/8] lcitool: drop perl from QEMU project/dependencies, marcandre . lureau, 2023/01/10
- [PATCH v3 8/8] lcitool: drop texinfo from QEMU project/dependencies, marcandre . lureau, 2023/01/10