diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-04-30 09:28:04 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-05-14 12:54:09 +0000 |
| commit | dcbb189bbeed39ab03b65fa821dec91cbb999f84 (patch) | |
| tree | 8ec48cac25b492bb080e31c90416bdbb1607f1bf /.gitlab-ci/container | |
| parent | da3aee926387cb9113b79c5376a6a8f4295582ac (diff) | |
| download | mesa-dcbb189bbeed39ab03b65fa821dec91cbb999f84.tar.gz | |
gitlab-ci: Move lib{drm,pciaccess}-dev cross packages out of loop
Simpler like this, since they're only needed for one cross architecture
each.
Acked-by: Andres Gomez <agomez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4851>
Diffstat (limited to '.gitlab-ci/container')
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 87d1b93b47f..6346e12abaf 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -52,6 +52,7 @@ apt-get install -y --no-remove \ libclang-7-dev \ libclang-9-dev \ libclc-dev \ + libdrm-dev:s390x \ libelf-dev \ libepoxy-dev \ libexpat1-dev \ @@ -59,6 +60,7 @@ apt-get install -y --no-remove \ libgtk-3-dev \ libomxil-bellagio-dev \ libpciaccess-dev \ + libpciaccess-dev:i386 \ libtool \ libunwind-dev \ libva-dev \ @@ -99,7 +101,6 @@ apt-get install -y --no-remove -t buster-backports \ for arch in $CROSS_ARCHITECTURES; do apt-get install -y --no-remove \ crossbuild-essential-${arch} \ - libdrm-dev:${arch} \ libelf-dev:${arch} \ libexpat1-dev:${arch} \ libffi-dev:${arch} \ @@ -109,12 +110,6 @@ for arch in $CROSS_ARCHITECTURES; do apt-get install -y --no-remove -t buster-backports \ libllvm8:${arch} - if [ "$arch" == "i386" ]; then - # libpciaccess-dev is only needed for Intel. - apt-get install -y --no-remove \ - 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 |