On 04/08/2020 20.32, Stefan Weil wrote: > Am 04.08.20 um 19:00 schrieb Thomas Huth: > >> To compile-test the WHPX accelerator, we need to download these system >> headers first (they are unfortunately not part of any released and >> packaged MinGW toolchain yet). >> >> Idea taken from another patch by Stefan Weil. >> >> Signed-off-by: Thomas Huth <th...@redhat.com> >> --- >> tests/docker/dockerfiles/debian-win64-cross.docker | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker >> b/tests/docker/dockerfiles/debian-win64-cross.docker >> index 2fc9cfcbc6..4cc4a3f365 100644 >> --- a/tests/docker/dockerfiles/debian-win64-cross.docker >> +++ b/tests/docker/dockerfiles/debian-win64-cross.docker >> @@ -32,7 +32,14 @@ RUN apt-get update && \ >> mxe-$TARGET-w64-mingw32.shared-sdl2 \ >> mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ >> mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ >> - mxe-$TARGET-w64-mingw32.shared-zlib >> + mxe-$TARGET-w64-mingw32.shared-zlib \ >> + curl && \ >> + curl -s -S -o >> /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvEmulation.h \ >> + >> "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvemulation.h?format=raw"; >> && \ >> + curl -s -S -o >> /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvPlatform.h \ >> + >> "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatform.h?format=raw"; >> && \ >> + curl -s -S -o >> /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/winhvplatformdefs.h \ >> + >> "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatformdefs.h?format=raw"; >> >> # Specify the cross prefix for this image (see tests/docker/common.rc) >> ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32.shared- > > > I expect a build failure: Mingw-w64 decided to use lower case filenames, > and those header files include each other.
The first two headers include the third header, that's why I've used lowercase for the third header (which is apparently not included by QEMU directly). But yes, all that CamelCase vs. lower-case stuff is very annoying. I think once there is a new MinGW release available in the major Linux distros that ships with these headers, we should change the QEMU source code to always use the lowercase headers, too. Thomas
