diff options
| author | Eric Anholt <[email protected]> | 2019-07-11 12:58:28 -0700 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-07-13 13:46:24 +0000 |
| commit | 11aa32a447ed2f48cf6b5fdbd94d153c8564daa5 (patch) | |
| tree | a8fb67dede2052f2d593331d01c4def8bf24548f /.gitlab-ci | |
| parent | ce81c9a2e1ee5b8c8acc333fd943abb4fd1c77c9 (diff) | |
gitlab-ci: Build i386 and ARM drivers in surfaceless mode.
I don't particularly care about getting x86/ARM cross-build coverage
of all the window systems, but we do want to be building src/mesa/
(for x86 asm) and gallium drivers (for vc4 NEON asm). I'm also hoping
to use these build products for testing freedreno on actual HW (which
we do using surfaceless).
This increases the docker image from 1.4G to 1.5G.
Reviewed-by: Michel Dänzer <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 22 | ||||
| -rwxr-xr-x | .gitlab-ci/meson-build.sh | 1 |
2 files changed, 22 insertions, 1 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 1e4d3283be0..64f970fa81f 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -5,6 +5,11 @@ set -o xtrace export DEBIAN_FRONTEND=noninteractive +CROSS_ARCHITECTURES="armhf arm64 i386" +for arch in $CROSS_ARCHITECTURES; do + dpkg --add-architecture $arch +done + apt-get install -y \ apt-transport-https \ ca-certificates \ @@ -75,6 +80,22 @@ apt-get install -y \ gettext \ make +# Cross-build Mesa deps +for arch in $CROSS_ARCHITECTURES; do + apt-get install -y \ + libdrm-dev:${arch} \ + libexpat1-dev:${arch} \ + libelf-dev:${arch} +done +apt-get install -y \ + dpkg-dev \ + gcc-aarch64-linux-gnu \ + g++-aarch64-linux-gnu \ + gcc-arm-linux-gnueabihf \ + g++-arm-linux-gnueabihf \ + gcc-i686-linux-gnu \ + g++-i686-linux-gnu + # for 64bit windows cross-builds apt-get install -y mingw-w64 @@ -185,7 +206,6 @@ apt-get install -y libxml2-utils apt-get purge -y \ automake \ libtool \ - make \ curl \ unzip \ wget \ diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index ed188e34d98..2bf51de1cd6 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -16,6 +16,7 @@ fi rm -rf _build meson _build --native-file=native.file \ + ${CROSS} \ -D buildtype=debug \ -D build-tests=true \ -D libunwind=${UNWIND} \ |