Module: Mesa Branch: main Commit: 2c5a2f1a054259602b47ae5e3e493426bdab503c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c5a2f1a054259602b47ae5e3e493426bdab503c
Author: Emma Anholt <[email protected]> Date: Mon Apr 24 09:39:09 2023 -0700 ci/valve: Add a workaround for finding libdrm on navi21s. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495> --- .gitlab-ci/common/init-stage2.sh | 5 +++++ .gitlab-ci/deqp-runner.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index 833d23d8f88..b9d00a13b01 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -87,6 +87,11 @@ ln -sf $CI_PROJECT_DIR/install /install export LD_LIBRARY_PATH=/install/lib export LIBGL_DRIVERS_PATH=/install/lib/dri +# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495#note_1876691 +# The navi21 boards seem to have trouble with ld.so.cache, so try explicitly +# telling it to look in /usr/local/lib. +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + # Store Mesa's disk cache under /tmp, rather than sending it out over NFS. export XDG_CACHE_HOME=/tmp diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index dc29a1ea19e..62137c39eac 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -15,7 +15,7 @@ fi INSTALL=$(realpath -s "$PWD"/install) # Set up the driver environment. -export LD_LIBRARY_PATH="$INSTALL"/lib/ +export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH export EGL_PLATFORM=surfaceless export VK_ICD_FILENAMES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/
