OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: prune dri from LD_LIBRARY_PATH

Browse Source 
partial revert of 50fc7cc290

Fixes: 50fc7cc290 ("glx: directly link to gallium")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30346>
This commit is contained in:
Mike Blumenkrantz
2024-07-24 10:24:20 -04:00
committed by Marge Bot
parent a885f91617
commit 6cd4372460
10 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/common/init-stage2.sh
View File

@@ -94,7 +94,7 @@ fi
# Fix prefix confusion: the build installs to $CI_PROJECT_DIR, but we expect # Fix prefix confusion: the build installs to $CI_PROJECT_DIR, but we expect
# it in /install # it in /install
ln -sf $CI_PROJECT_DIR/install /install ln -sf $CI_PROJECT_DIR/install /install
export LD_LIBRARY_PATH=/install/lib:/install/lib/dri export LD_LIBRARY_PATH=/install/lib
export LIBGL_DRIVERS_PATH=/install/lib/dri export LIBGL_DRIVERS_PATH=/install/lib/dri
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495#note_1876691 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495#note_1876691
@@ -113,7 +113,7 @@ export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
if [ -n "$MESA_LOADER_DRIVER_OVERRIDE" ]; then if [ -n "$MESA_LOADER_DRIVER_OVERRIDE" ]; then
rm /install/lib/dri/!($MESA_LOADER_DRIVER_OVERRIDE)_dri.so rm /install/lib/dri/!($MESA_LOADER_DRIVER_OVERRIDE)_dri.so
fi fi
ls -1 /install/lib/dri/*.so || true ls -1 /install/lib/dri/*_dri.so || true
if [ "$HWCI_FREQ_MAX" = "true" ]; then if [ "$HWCI_FREQ_MAX" = "true" ]; then
# Ensure initialization of the DRM device (needed by MSM) # Ensure initialization of the DRM device (needed by MSM)

2
.gitlab-ci/common/start-x.sh
View File

@@ -7,7 +7,7 @@ _FLAG_FILE="/xorg-started"
echo "touch ${_FLAG_FILE}; sleep 100000" > "${_XORG_SCRIPT}" echo "touch ${_FLAG_FILE}; sleep 100000" > "${_XORG_SCRIPT}"
if [ "x$1" != "x" ]; then if [ "x$1" != "x" ]; then
export LD_LIBRARY_PATH="${1}/lib:${1}/lib/dri" export LD_LIBRARY_PATH="${1}/lib"
export LIBGL_DRIVERS_PATH="${1}/lib/dri" export LIBGL_DRIVERS_PATH="${1}/lib/dri"
fi fi
xinit /bin/sh "${_XORG_SCRIPT}" -- /usr/bin/Xorg vt45 -noreset -s 0 -dpms -logfile /Xorg.0.log & xinit /bin/sh "${_XORG_SCRIPT}" -- /usr/bin/Xorg vt45 -noreset -s 0 -dpms -logfile /Xorg.0.log &

2
.gitlab-ci/cuttlefish-runner.sh
View File

@@ -6,7 +6,7 @@ set -xe
export HOME=/cuttlefish export HOME=/cuttlefish
export PATH=$PATH:/cuttlefish/bin export PATH=$PATH:/cuttlefish/bin
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${CI_PROJECT_DIR}/install/lib/:${CI_PROJECT_DIR}/install/lib/dri:/cuttlefish/lib64 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${CI_PROJECT_DIR}/install/lib/:/cuttlefish/lib64
export EGL_PLATFORM=surfaceless export EGL_PLATFORM=surfaceless
syslogd syslogd

2
.gitlab-ci/deqp-runner.sh
View File

@@ -16,7 +16,7 @@ fi
INSTALL=$(realpath -s "$PWD"/install) INSTALL=$(realpath -s "$PWD"/install)
# Set up the driver environment. # Set up the driver environment.
export LD_LIBRARY_PATH="$INSTALL"/lib/:"$INSTALL"/lib/dri:$LD_LIBRARY_PATH export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH
export EGL_PLATFORM=surfaceless export EGL_PLATFORM=surfaceless
ARCH=$(uname -m) ARCH=$(uname -m)
export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH".json export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH".json

2
.gitlab-ci/fossilize-runner.sh
View File

@@ -10,7 +10,7 @@ fi
INSTALL=$PWD/install INSTALL=$PWD/install
# Set up the driver environment. # Set up the driver environment.
export LD_LIBRARY_PATH="$INSTALL/lib/:$INSTALL/lib/dri" export LD_LIBRARY_PATH="$INSTALL/lib/"
export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json" export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
# To store Fossilize logs on failure. # To store Fossilize logs on failure.

2
.gitlab-ci/gtest-runner.sh
View File

@@ -6,7 +6,7 @@ set -ex
INSTALL=$PWD/install INSTALL=$PWD/install
# Set up the driver environment. # Set up the driver environment.
export LD_LIBRARY_PATH=$INSTALL/lib/:$INSTALL/lib/dri export LD_LIBRARY_PATH=$INSTALL/lib/
RESULTS="$PWD/${GTEST_RESULTS_DIR:-results}" RESULTS="$PWD/${GTEST_RESULTS_DIR:-results}"
mkdir -p "$RESULTS" mkdir -p "$RESULTS"

2
.gitlab-ci/piglit/piglit-runner.sh
View File

@@ -11,7 +11,7 @@ fi
INSTALL="$PWD/install" INSTALL="$PWD/install"
# Set up the driver environment. # Set up the driver environment.
export LD_LIBRARY_PATH="$INSTALL/lib/:$INSTALL/lib/dri" export LD_LIBRARY_PATH="$INSTALL/lib/"
export EGL_PLATFORM=surfaceless export EGL_PLATFORM=surfaceless
ARCH=$(uname -m) ARCH=$(uname -m)
export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json" export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"

2
.gitlab-ci/piglit/piglit-traces.sh
View File

@@ -47,7 +47,7 @@ export WINEDLLOVERRIDES="mscoree=d;mshtml=d" # FIXME: drop, not needed anymore?
# Modifiying here directly LD_LIBRARY_PATH may cause problems when # Modifiying here directly LD_LIBRARY_PATH may cause problems when
# using a command wrapper. Hence, we will just set it when running the # using a command wrapper. Hence, we will just set it when running the
# command. # command.
export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:$INSTALL/lib/dri" export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
if [ -n "${VK_DRIVER}" ]; then if [ -n "${VK_DRIVER}" ]; then
# Set environment for DXVK. # Set environment for DXVK.
export DXVK_LOG_LEVEL="info" export DXVK_LOG_LEVEL="info"

2
.gitlab-ci/run-shader-db.sh
View File

@@ -6,7 +6,7 @@ mkdir -p "$ARTIFACTSDIR"
export DRM_SHIM_DEBUG=true export DRM_SHIM_DEBUG=true
LIBDIR=$(pwd)/install/lib LIBDIR=$(pwd)/install/lib
export LD_LIBRARY_PATH=$LIBDIR:$LIBDIR/dri export LD_LIBRARY_PATH=$LIBDIR
cd /usr/local/shader-db cd /usr/local/shader-db

2
.gitlab-ci/vkd3d-proton/run.sh
View File

@@ -17,7 +17,7 @@ mkdir -p "$RESULTS"
# Modifiying here directly LD_LIBRARY_PATH may cause problems when # Modifiying here directly LD_LIBRARY_PATH may cause problems when
# using a command wrapper. Hence, we will just set it when running the # using a command wrapper. Hence, we will just set it when running the
# command. # command.
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:$INSTALL/lib/dri:/vkd3d-proton-tests/x64/" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"
# Set the Vulkan driver to use. # Set the Vulkan driver to use.