diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-03-04 09:37:46 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-03-11 19:30:13 +0000 |
| commit | 529c0ba2199852e7d894955e30620885f3bffd47 (patch) | |
| tree | 22663f97949b0a4fc09483981ec0146e1a09b431 /.gitlab-ci | |
| parent | f0178f516f5f96c599592d86c3975234264fefc5 (diff) | |
gitlab-ci: build RADV in meson-i386 to avoid 32-bit build failures
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4044>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4044>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 51513874c99..3ee0dad6463 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -96,21 +96,23 @@ for arch in $CROSS_ARCHITECTURES; do crossbuild-essential-${arch} \ libdrm-dev:${arch} \ libelf-dev:${arch} \ - libexpat1-dev:${arch} - - if [ "$arch" != "i386" ]; then - mkdir /var/cache/apt/archives/${arch} + libexpat1-dev:${arch} \ + libffi-dev:${arch} \ + libllvm8:${arch} \ + libstdc++6:${arch} \ + libtinfo-dev:${arch} + + if [ "$arch" == "i386" ]; then + # libpciaccess-dev is only needed for Intel. apt-get install -y --no-remove \ - libffi-dev:${arch} \ - libllvm8:${arch} \ - libstdc++6:${arch} \ - libtinfo-dev:${arch} \ - - # Download llvm-* packages, but don't install them yet, since they can - # only be installed for one architecture at a time - apt-get install -o Dir::Cache::archives=/var/cache/apt/archives/$arch --download-only -y --no-remove \ - llvm-8-dev:${arch} + libpciaccess-dev:${arch} fi + + mkdir /var/cache/apt/archives/${arch} + # Download llvm-* packages, but don't install them yet, since they can + # only be installed for one architecture at a time + apt-get install -o Dir::Cache::archives=/var/cache/apt/archives/$arch --download-only -y --no-remove \ + llvm-8-dev:${arch} done apt-get install -y --no-remove \ @@ -190,6 +192,7 @@ tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2 cd $LIBDRM_VERSION meson build -D vc4=true -D freedreno=true -D etnaviv=true -D libdir=lib/x86_64-linux-gnu; ninja -j4 -C build install rm -rf build; meson --cross-file=/cross_file-ppc64el.txt build -D libdir=lib/powerpc64le-linux-gnu; ninja -j4 -C build install +rm -rf build; meson --cross-file=/cross_file-i386.txt build -D libdir=lib/i386-linux-gnu; ninja -j4 -C build install cd .. rm -rf $LIBDRM_VERSION |