KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab-ci: Set ccache path for cross compilers in meson cross file 

Without this, meson didn't pick up ccache for cross builds.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Michel Dänzer 2019-09-30 10:36:04 +02:00 committed by Michel Dänzer
parent f83874a405
commit e55df4c859
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -14,7 +14,7 @@
# repository's registry will be used there as well.
variables:
UPSTREAM_REPO: mesa/mesa
DEBIAN_TAG: "2019-09-18"
DEBIAN_TAG: "2019-09-30"
DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
STRETCH_TAG: "2019-09-18"
DEBIAN_VERSION: buster-slim

2
.gitlab-ci/debian-install.sh
View File

@ -199,6 +199,8 @@ apt-get install -y --no-remove libxml2-utils
for arch in $CROSS_ARCHITECTURES; do
cross_file="/cross_file-$arch.txt"
/usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file"
# Explicitly set ccache path for cross compilers
sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\\2-g|g" "$cross_file"
# Work around a bug in debcrossgen that should be fixed in the next release
if [ "$arch" = "i386" ]; then
sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file"