From d905d9b6004a2cd9c86f96e569a7cc9e3995ba2b Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 19 Sep 2019 10:21:51 -0700 Subject: [PATCH] gitlab-ci: Add a mingw x86_64 job Acked-by: Eric Engestrom (v1) Acked-by: Kristian H. Kristensen --- .gitlab-ci.yml | 13 ++++++++++++- .gitlab-ci/debian-install.sh | 7 ++++++- .gitlab-ci/x86_64-w64-mingw32 | 20 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci/x86_64-w64-mingw32 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f245ee687c1..b5d2d2f2876 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ # repository's registry will be used there as well. variables: UPSTREAM_REPO: mesa/mesa - DEBIAN_TAG: "2019-09-30" + DEBIAN_TAG: "2019-10-07_1" DEBIAN_ARM64_TAG: "arm64v8-2019-08-09" STRETCH_TAG: "2019-09-18" DEBIAN_VERSION: buster-slim @@ -344,6 +344,17 @@ meson-i386: -D llvm=false -D osmesa=classic +meson-mingw32-x86_64: + extends: .meson-build + variables: + UNWIND: "false" + DRI_DRIVERS: "" + GALLIUM_DRIVERS: "swrast" + EXTRA_OPTION: > + -Dllvm=false + -Dosmesa=gallium + --cross-file=.gitlab-ci/x86_64-w64-mingw32 + scons: extends: .scons-build variables: diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index ef690ce830c..c874a892e7b 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -82,7 +82,12 @@ for arch in $CROSS_ARCHITECTURES; do done # for 64bit windows cross-builds -apt-get install -y --no-remove mingw-w64 +apt-get install -y --no-remove \ + mingw-w64 \ + libz-mingw-w64-dev \ + wine \ + wine32 \ + wine64 # for the vulkan overlay layer wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip diff --git a/.gitlab-ci/x86_64-w64-mingw32 b/.gitlab-ci/x86_64-w64-mingw32 new file mode 100644 index 00000000000..f4346c8f624 --- /dev/null +++ b/.gitlab-ci/x86_64-w64-mingw32 @@ -0,0 +1,20 @@ +[binaries] +c = ['ccache', 'x86_64-w64-mingw32-gcc'] +cpp = ['ccache', 'x86_64-w64-mingw32-g++'] +ar = 'x86_64-w64-mingw32-ar' +strip = 'x86_64-w64-mingw32-strip' +pkgconfig = 'x86_64-w64-mingw32-pkg-config' +windres = 'x86_64-w64-mingw32-windres' +exe_wrapper = ['wine64'] + +[properties] +needs_exe_wrapper = True +sys_root = '/usr/x86_64-w64-mingw32/' + +[host_machine] +system = 'windows' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' + +; vim: ft=dosini -- 2.30.2