gitlab-ci: Don't build libdrm for ARM
The Debian packages work fine. Saves a little bit of time and disk space. Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:

committed by
Michel Dänzer

parent
b4d3ae2269
commit
e0fff37f70
@@ -17,6 +17,7 @@ apt-get -y install \
|
|||||||
flex \
|
flex \
|
||||||
g++ \
|
g++ \
|
||||||
gettext \
|
gettext \
|
||||||
|
libdrm-dev \
|
||||||
libdrm-dev:armhf \
|
libdrm-dev:armhf \
|
||||||
libelf-dev \
|
libelf-dev \
|
||||||
libelf-dev:armhf \
|
libelf-dev:armhf \
|
||||||
@@ -41,17 +42,6 @@ sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\
|
|||||||
# Don't need wrapper for armhf executables
|
# Don't need wrapper for armhf executables
|
||||||
sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
|
sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
|
||||||
|
|
||||||
export LIBDRM_VERSION=libdrm-2.4.99
|
|
||||||
|
|
||||||
############### Build libdrm
|
|
||||||
|
|
||||||
wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
|
|
||||||
tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
|
|
||||||
cd $LIBDRM_VERSION; meson build/ -Detnaviv=true; ninja -C build/ install; cd ..
|
|
||||||
rm -rf $LIBDRM_VERSION
|
|
||||||
|
|
||||||
############### Uninstall the build software
|
|
||||||
|
|
||||||
apt-get purge -y \
|
apt-get purge -y \
|
||||||
wget
|
wget
|
||||||
|
|
||||||
|
@@ -15,6 +15,7 @@ apt-get -y install \
|
|||||||
gcc \
|
gcc \
|
||||||
git \
|
git \
|
||||||
libc6-dev \
|
libc6-dev \
|
||||||
|
libdrm-nouveau2 \
|
||||||
libexpat1 \
|
libexpat1 \
|
||||||
libgbm-dev \
|
libgbm-dev \
|
||||||
libgbm-dev \
|
libgbm-dev \
|
||||||
@@ -29,15 +30,6 @@ apt-get -y install \
|
|||||||
wget \
|
wget \
|
||||||
zlib1g
|
zlib1g
|
||||||
|
|
||||||
export LIBDRM_VERSION=libdrm-2.4.99
|
|
||||||
|
|
||||||
############### Build libdrm
|
|
||||||
|
|
||||||
wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
|
|
||||||
tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
|
|
||||||
cd $LIBDRM_VERSION; meson build/ -Detnaviv=true; ninja -C build/ install; cd ..
|
|
||||||
rm -rf $LIBDRM_VERSION
|
|
||||||
|
|
||||||
############### Build dEQP
|
############### Build dEQP
|
||||||
|
|
||||||
git config --global user.email "mesa@example.com"
|
git config --global user.email "mesa@example.com"
|
||||||
|
Reference in New Issue
Block a user