ci: Do not install armhf LLVM packages
LLVM support has been disabled in the meson-armhf job for some time, so they were unused. Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
This commit is contained in:
parent
efcdc7f7d8
commit
bc8e866b1d
|
@ -330,7 +330,7 @@ i386_build:
|
|||
extends:
|
||||
- .use-x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &i386_build "2021-04-11-libdrm"
|
||||
MESA_IMAGE_TAG: &i386_build "2021-04-13-armhf-no-llvm"
|
||||
|
||||
.use-i386_build:
|
||||
extends:
|
||||
|
@ -347,7 +347,7 @@ ppc64el_build:
|
|||
extends:
|
||||
- .use-x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &ppc64el_build "2021-04-11-libdrm"
|
||||
MESA_IMAGE_TAG: &ppc64el_build "2021-04-13-armhf-no-llvm"
|
||||
|
||||
.use-ppc64el_build:
|
||||
extends:
|
||||
|
@ -364,7 +364,7 @@ s390x_build:
|
|||
extends:
|
||||
- .use-x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &s390x_build "2021-04-11-libdrm"
|
||||
MESA_IMAGE_TAG: &s390x_build "2021-04-13-armhf-no-llvm"
|
||||
|
||||
.use-s390x_build:
|
||||
extends:
|
||||
|
@ -427,7 +427,7 @@ arm_build:
|
|||
- .fdo.container-build@debian@arm64v8
|
||||
- .container
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &arm_build "2021-04-11-libdrm"
|
||||
MESA_IMAGE_TAG: &arm_build "2021-04-13-armhf-no-llvm"
|
||||
|
||||
.use-arm_build:
|
||||
extends:
|
||||
|
@ -818,7 +818,6 @@ meson-armhf:
|
|||
- .ci-deqp-artifacts
|
||||
variables:
|
||||
CROSS: armhf
|
||||
LLVM_VERSION: "7"
|
||||
EXTRA_OPTION: >
|
||||
-D llvm=disabled
|
||||
-D valgrind=false
|
||||
|
|
|
@ -38,15 +38,11 @@ apt-get install -y --no-remove \
|
|||
libxxf86vm-dev:$arch \
|
||||
wget
|
||||
|
||||
if [[ $arch == "armhf" ]]; then
|
||||
LLVM=llvm-7-dev
|
||||
else
|
||||
LLVM=llvm-8-dev
|
||||
if [[ $arch != "armhf" ]]; then
|
||||
apt-get install -y --no-remove -t buster-backports \
|
||||
llvm-8-dev:$arch
|
||||
fi
|
||||
|
||||
apt-get install -y --no-remove -t buster-backports \
|
||||
$LLVM:$arch
|
||||
|
||||
. .gitlab-ci/container/create-cross-file.sh $arch
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue