From: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri, 6 Sep 2019 15:33:13 +0000 (+0200)
Subject: gitlab-ci: Use crossbuild-essential-* packages
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a8388ca67979a35bcbf976b11ca0efe1471ae3a;p=mesa.git

gitlab-ci: Use crossbuild-essential-* packages

They are convenience packages which pull in everything needed for
cross-building via dependencies.

Acked-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 5c947b0d042..63b7270f50d 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -77,18 +77,9 @@ for arch in $CROSS_ARCHITECTURES; do
     apt-get install -y --no-remove \
             libdrm-dev:${arch} \
             libexpat1-dev:${arch} \
-            linux-libc-dev:${arch}/stretch-backports \
-            libelf-dev:${arch}
+            libelf-dev:${arch} \
+            crossbuild-essential-${arch}
 done
-apt-get install -y --no-remove \
-        g++/stretch \
-        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 --no-remove mingw-w64