Mesa (master): gitlab-ci: Move lib{drm,pciaccess}-dev cross packages out of loop

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: dcbb189bbeed39ab03b65fa821dec91cbb999f84
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcbb189bbeed39ab03b65fa821dec91cbb999f84

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Thu Apr 30 09:28:04 2020 +0200

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 at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4851>

---

 .gitlab-ci/container/x86_build.sh | 9 ++-------
 1 file 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