freedreno: Split ir3_const's user buffer and indirect upload APIs.

[mesa.git] / .gitlab-ci / container / cross_build.sh

diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index bfbac4f520bb00a096bd8204aea758ed7a75e964..1154a490eb4a97f4cb78e1c91ce341ec812fb667 100644 (file)
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -20,7 +20,8 @@ apt-get install -y --no-remove \
         libexpat1-dev:$arch \
         libffi-dev:$arch \
         libstdc++6:$arch \
-        libtinfo-dev:$arch
+        libtinfo-dev:$arch \
+        wget
 
 if [[ $arch == "armhf" ]]; then
         LLVM=llvm-7-dev
@@ -38,16 +39,8 @@ apt-get install -y --no-remove -t buster-backports \
 
 
 # dependencies where we want a specific version
-export LIBDRM_VERSION=libdrm-2.4.100
-
-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 --cross-file=/cross_file-${arch}.txt build -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)
-ninja -C build install
-cd ..
-rm -rf $LIBDRM_VERSION
-
+EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
+. .gitlab-ci/build-libdrm.sh
 
 apt-get purge -y \
         $STABLE_EPHEMERAL