diff options
| author | Eric Engestrom <[email protected]> | 2019-08-06 11:28:31 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-08-09 20:07:50 +0100 |
| commit | 9be5ce1d736f1fc13de26533a0ffb2e57137c304 (patch) | |
| tree | 735f3f5c6d35b22ea6e056c0f4a1cfd0c2f88dd9 /.gitlab-ci | |
| parent | 9bc99e60a879d163c052e92d83db0734352f71d5 (diff) | |
gitlab-ci: generate meson cross-files earlier
Suggested-by: Michel Dänzer <[email protected]>
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 8770e100ee0..eb4a37ee1e0 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -207,6 +207,18 @@ apt-get install -y ccache # We need xmllint to validate the XML files in Mesa apt-get install -y libxml2-utils + +# Generate cross build files for Meson +for arch in $CROSS_ARCHITECTURES; do + cross_file="/cross_file-$arch.txt" + /usr/share/meson/debcrossgen --arch "$arch" -o "$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" + fi +done + + # Remove unused packages apt-get purge -y \ git \ |