| Message ID | 20230322135721.61138-2-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | ci: Remove cirrus-ci & cover SPICE in MSYS2 at gitlab-ci | expand |
On Wed, Mar 22, 2023 at 02:57:20PM +0100, Philippe Mathieu-Daudé wrote: > Include the mingw-w64-x86_64-spice package so SPICE is covered: > > C compiler for the host machine: cc -m64 -mcx16 (gcc 12.2.0 "cc (Rev10, Built by MSYS2 project) 12.2.0") > ... > Run-time dependency spice-protocol found: YES 0.14.4 > Run-time dependency spice-server found: YES 0.15.1 > > In particular this would have helped catching the build issue > reported as https://gitlab.com/qemu-project/qemu/-/issues/1553: > > [1851/5253] Compiling C object libcommon.fa.p/ui_spice-core.c.obj > FAILED: libcommon.fa.p/ui_spice-core.c.obj > ../ui/spice-core.c: In function 'watch_remove': > ../ui/spice-core.c:152:5: error: implicit declaration of function 'qemu_close_to_socket' [-Werror=implicit-function-declaration] > 152 | qemu_close_to_socket(watch->fd); > | ^~~~~~~~~~~~~~~~~~~~ > ../ui/spice-core.c:152:5: error: nested extern declaration of 'qemu_close_to_socket' [-Werror=nested-externs] > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > See https://gitlab.com/philmd/qemu/-/jobs/3980693656#L2378 > --- > .gitlab-ci.d/windows.yml | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 87235e43b4..472bacd2e2 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -59,6 +59,7 @@ msys2-64bit: mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-snappy + mingw-w64-x86_64-spice mingw-w64-x86_64-usbredir mingw-w64-x86_64-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory @@ -108,6 +109,7 @@ msys2-32bit: mingw-w64-i686-SDL2 mingw-w64-i686-SDL2_image mingw-w64-i686-snappy + mingw-w64-i686-spice mingw-w64-i686-usbredir mingw-w64-i686-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
Include the mingw-w64-x86_64-spice package so SPICE is covered: C compiler for the host machine: cc -m64 -mcx16 (gcc 12.2.0 "cc (Rev10, Built by MSYS2 project) 12.2.0") ... Run-time dependency spice-protocol found: YES 0.14.4 Run-time dependency spice-server found: YES 0.15.1 In particular this would have helped catching the build issue reported as https://gitlab.com/qemu-project/qemu/-/issues/1553: [1851/5253] Compiling C object libcommon.fa.p/ui_spice-core.c.obj FAILED: libcommon.fa.p/ui_spice-core.c.obj ../ui/spice-core.c: In function 'watch_remove': ../ui/spice-core.c:152:5: error: implicit declaration of function 'qemu_close_to_socket' [-Werror=implicit-function-declaration] 152 | qemu_close_to_socket(watch->fd); | ^~~~~~~~~~~~~~~~~~~~ ../ui/spice-core.c:152:5: error: nested extern declaration of 'qemu_close_to_socket' [-Werror=nested-externs] Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- See https://gitlab.com/philmd/qemu/-/jobs/3980693656#L2378 --- .gitlab-ci.d/windows.yml | 2 ++ 1 file changed, 2 insertions(+)