diff options
| author | Dylan Baker <[email protected]> | 2019-10-11 09:21:17 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-10-16 23:26:09 +0000 |
| commit | 6e375ff1aa0a14fa71b8d983409e27fac610bd50 (patch) | |
| tree | 71d5a20fa79861d4ecfbf9bb6ef29549904c5923 | |
| parent | 4441da00448df0700e4424900091ebbdaa6a3c4f (diff) | |
gitlab-ci: Add a pkg-config for mingw
The one debian provides is broken in buster+, so I've just written my
own. This allows meson to find the installed zlib and prevents it from
falling back to wraps.
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 10 | ||||
| -rw-r--r-- | .gitlab-ci/x86_64-w64-mingw32 | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 258430d4449..f67f9bb112a 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-10-07_1" + DEBIAN_TAG: "2019-10-16" DEBIAN_ARM64_TAG: "arm64v8-2019-08-09" STRETCH_TAG: "2019-09-18" DEBIAN_VERSION: buster-slim diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index c874a892e7b..8a74b2877da 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -89,6 +89,16 @@ apt-get install -y --no-remove \ wine32 \ wine64 +# Debian's pkg-config wrapers for mingw are broken, and there's no sign that +# they're going to be fixed, so we'll just have to fix it ourselves +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930492 +cat >/usr/local/bin/x86_64-w64-mingw32-pkg-config <<EOF +#!/bin/sh + +PKG_CONFIG_LIBDIR=/usr/x86_64-w64-mingw32/lib/pkgconfig pkg-config \$@ +EOF +chmod +x /usr/local/bin/x86_64-w64-mingw32-pkg-config + # for the vulkan overlay layer wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip unzip glslang-master-linux-Release.zip bin/glslangValidator diff --git a/.gitlab-ci/x86_64-w64-mingw32 b/.gitlab-ci/x86_64-w64-mingw32 index f4346c8f624..4db606e2bf7 100644 --- a/.gitlab-ci/x86_64-w64-mingw32 +++ b/.gitlab-ci/x86_64-w64-mingw32 @@ -3,7 +3,7 @@ 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' +pkgconfig = '/usr/local/bin/x86_64-w64-mingw32-pkg-config' windres = 'x86_64-w64-mingw32-windres' exe_wrapper = ['wine64'] |