Commit b2e4060b authored by Alexandros Frantzis's avatar Alexandros Frantzis

Update Mesa build for changes in upstream scripts

Upstream meson-build.sh was recently updated (Mesa commit 9605749f) to
install files to a different location, and expects files to be in that
particular location later in the script. This means we can't set our own
destdir anymore, so just work with what upstream uses.
Signed-off-by: Alexandros Frantzis's avatarAlexandros Frantzis <alexandros.frantzis@collabora.com>
Reviewed-by: 's avatarEmil Velikov <emil.velikov@collabora.com>
parent 5c01be3d
......@@ -79,7 +79,6 @@ mesa-build:
LLVM_VERSION: "7"
EXTRA_OPTION: >
-D tools=all
-D prefix=$CI_PROJECT_DIR/install
MESA_REPO: "https://gitlab.freedesktop.org/mesa/mesa"
MESA_COMMIT: "master"
before_script:
......@@ -99,7 +98,7 @@ mesa-build:
when: always
paths:
- $CI_PROJECT_DIR/mesa_sha.txt
- $CI_PROJECT_DIR/install
- $CI_PROJECT_DIR/mesa/install
expire_in: 1 week
# TESTING
......@@ -119,7 +118,7 @@ conformance:
- export LIBGL_ALWAYS_SOFTWARE=1
- export GALLIUM_DRIVER=softpipe
- export MESA_SHA=$(cat $CI_PROJECT_DIR/mesa_sha.txt)
- export LD_LIBRARY_PATH="/usr/local/lib/:$CI_PROJECT_DIR/install/lib"
- export LD_LIBRARY_PATH="/usr/local/lib/:$CI_PROJECT_DIR/mesa/install/lib"
- bash $CI_PROJECT_DIR/scripts/setup-x.sh
- export DEVICE_NAME="$(python3 scripts/vendor_device_name.py)"
- export PYTHONPATH=/usr/local/lib/$(py3versions -d)/site-packages # Required for renderdoc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment