fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gitlab-ci: Merge ccache and libxml2-utils into main apt-get install

Browse source 
The motivation for this is that we want to make use of the meson cross
files in this script, which have the ccache compiler paths.

We need to remove the ccache directory at the end, it would just waste
space in the image for no benefit.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3643>
This commit is contained in:
Michel Dänzer 2020-01-31 16:48:36 +01:00 • committed by Marge Bot
parent a06fc0296d
commit a443f81f26
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitlab-ci/container/x86_build.sh
View file

@ -39,6 +39,7 @@ apt-get install -y --no-remove \
automake \
autotools-dev \
bison \
ccache \
clang-9 \
cmake \
flex \
@ -67,6 +68,7 @@ apt-get install -y --no-remove \
libx11-xcb-dev \
libxdamage-dev \
libxext-dev \
libxml2-utils \
libxrandr-dev \
libxrender-dev \
libxshmfence-dev \
@ -181,12 +183,6 @@ cd shader-db
make -j4
popd
# Use ccache to speed up builds
apt-get install -y --no-remove ccache
# We need xmllint to validate the XML files in Mesa
apt-get install -y --no-remove libxml2-utils
# Generate cross build files for Meson
for arch in $CROSS_ARCHITECTURES; do
@ -203,6 +199,10 @@ for arch in $CROSS_ARCHITECTURES; do
done
# Remove ccache directory, useless for the build jobs
rm -rf $(ccache --get-config=cache_dir)
############### Uninstall the build software
apt-get purge -y \