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>
This commit is contained in:
Eric Anholt
2019-07-25 11:02:34 -07:00
parent f417ced5cc
commit 9605749f99
2 changed files with 4 additions and 3 deletions

View File

@@ -17,6 +17,7 @@ fi
rm -rf _build rm -rf _build
meson _build --native-file=native.file \ meson _build --native-file=native.file \
${CROSS+--cross /cross_file-$CROSS.txt} \ ${CROSS+--cross /cross_file-$CROSS.txt} \
-D prefix=`pwd`/install \
-D libdir=lib \ -D libdir=lib \
-D buildtype=debug \ -D buildtype=debug \
-D build-tests=true \ -D build-tests=true \
@@ -32,7 +33,7 @@ cd _build
meson configure meson configure
ninja -j4 ninja -j4
LC_ALL=C.UTF-8 ninja test LC_ALL=C.UTF-8 ninja test
DESTDIR=$PWD/../install ninja install ninja install
cd .. cd ..
if test -n "$MESON_SHADERDB"; then if test -n "$MESON_SHADERDB"; then

View File

@@ -5,8 +5,8 @@ ARTIFACTSDIR=`pwd`/shader-db
mkdir -p $ARTIFACTSDIR mkdir -p $ARTIFACTSDIR
export DRM_SHIM_DEBUG=true export DRM_SHIM_DEBUG=true
LIBDIR=`pwd`/install/usr/local/lib LIBDIR=`pwd`/install/lib
export LIBGL_DRIVERS_PATH=$LIBDIR/dri export LD_LIBRARY_PATH=$LIBDIR
cd /usr/local/shader-db cd /usr/local/shader-db