From: Eric Anholt <eric@anholt.net>
Date: Thu, 25 Jul 2019 18:02:34 +0000 (-0700)
Subject: gitlab-ci: Set the prefix to ./install instead of the DESTDIR.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9605749f995b3a7b1d94d71994cdc57b9d0bfdff;p=mesa.git

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 <eric.engestrom@intel.com>
---

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