diff options
| author | Eric Anholt <[email protected]> | 2019-07-25 11:02:34 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2019-08-13 10:30:01 -0700 |
| commit | 9605749f995b3a7b1d94d71994cdc57b9d0bfdff (patch) | |
| tree | 197e0f7c4c0695f715f0967cdf68208dfc89e042 | |
| parent | f417ced5cc89ce0790663246d52903079599bf67 (diff) | |
gitlab-ci: Set the prefix to ./install instead of the DESTDIR.
If we don't set DESTDIR, then the DEFAULT_DRIVER_DIR built into the
libraries is correct and we don't need to use LIBGL_DRIVERS_PATH and
friends for CI usage. Incidentally, this moves our installed paths
from /builds/anholt/mesa/install/usr/local/lib (for example) to
/builds/anholt/mesa/install/lib for simplicity.
Reviewed-by: Eric Engestrom <[email protected]>
| -rwxr-xr-x | .gitlab-ci/meson-build.sh | 3 | ||||
| -rwxr-xr-x | .gitlab-ci/run-shader-db.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index d0df91fa394..42aed0e91c5 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -17,6 +17,7 @@ fi rm -rf _build meson _build --native-file=native.file \ ${CROSS+--cross /cross_file-$CROSS.txt} \ + -D prefix=`pwd`/install \ -D libdir=lib \ -D buildtype=debug \ -D build-tests=true \ @@ -32,7 +33,7 @@ cd _build meson configure ninja -j4 LC_ALL=C.UTF-8 ninja test -DESTDIR=$PWD/../install ninja install +ninja install cd .. if test -n "$MESON_SHADERDB"; then diff --git a/.gitlab-ci/run-shader-db.sh b/.gitlab-ci/run-shader-db.sh index a6093e5d57b..7580457d850 100755 --- a/.gitlab-ci/run-shader-db.sh +++ b/.gitlab-ci/run-shader-db.sh @@ -5,8 +5,8 @@ ARTIFACTSDIR=`pwd`/shader-db mkdir -p $ARTIFACTSDIR export DRM_SHIM_DEBUG=true -LIBDIR=`pwd`/install/usr/local/lib -export LIBGL_DRIVERS_PATH=$LIBDIR/dri +LIBDIR=`pwd`/install/lib +export LD_LIBRARY_PATH=$LIBDIR cd /usr/local/shader-db |