projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 3be7c67)
gitlab-ci: Keep g++ from stretch when installing foreign toolchains
authorMichel Dänzer <mdaenzer@redhat.com>
Fri, 6 Sep 2019 08:39:19 +0000 (10:39 +0200)
committerAdam Jackson <ajax@nwnk.net>
Wed, 11 Sep 2019 17:00:43 +0000 (17:00 +0000)
Upgrading to a newer g++ causes older LLVM/clang packages to be
removed.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
.gitlab-ci/debian-install.sh patch | blob | history

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 9b67f614e4a4d40aa06a19b99ca29b87016b4b5b..7e5b14232e70023c00435a6ce042c58f2515e5fe 100644 (file)
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -92,6 +92,7 @@ for arch in $CROSS_ARCHITECTURES; do
             libelf-dev:${arch}
 done
 apt-get install -y \
+        g++/stretch \
         dpkg-dev \
         gcc-aarch64-linux-gnu \
         g++-aarch64-linux-gnu \