summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2019-09-06 17:33:13 +0200
committerMichel Dänzer <[email protected]>2019-09-18 10:36:48 +0000
commit8a8388ca67979a35bcbf976b11ca0efe1471ae3a (patch)
tree3551108e058ccb0a416194695b5ae121efe4f715 /.gitlab-ci
parenta01230e73ae70a7e8a1b8af673a5ffaa1e183a53 (diff)
gitlab-ci: Use crossbuild-essential-* packages
They are convenience packages which pull in everything needed for cross-building via dependencies. Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/debian-install.sh13
1 files changed, 2 insertions, 11 deletions
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