Mesa (master): travis: add meson build for vulkan drivers.
Dylan Baker
dbaker at kemper.freedesktop.org
Tue Oct 3 17:03:43 UTC 2017
Module: Mesa
Branch: master
Commit: df82012b2cbac47694a490738c5e6a33e3a69ee3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df82012b2cbac47694a490738c5e6a33e3a69ee3
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Wed Sep 27 10:37:28 2017 -0700
travis: add meson build for vulkan drivers.
v2: - use -isystem`pwd` instead of cp to include fake linux header
(Eric E., Emil)
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
.travis.yml | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 088295e133..2c87f60ec1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ env:
- WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.8
- PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig:$HOME/prefix/share/pkgconfig
- LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
+ - PATH="$HOME/prefix/bin:$PATH"
matrix:
include:
@@ -392,10 +393,34 @@ matrix:
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
+ - env:
+ - LABEL="meson Vulkan"
+ - BUILD=meson
+ - MESON_OPTIONS="-Dbuild-tests=true"
+ addons:
+ apt:
+ sources:
+ - llvm-toolchain-trusty-3.9
+ packages:
+ # LLVM packaging is broken and misses these dependencies
+ - libedit-dev
+ # From sources above
+ - llvm-3.9-dev
+ # Common
+ - xz-utils
+ - libexpat1-dev
+ - libelf-dev
+ - python3-pip
install:
- pip install --user mako
+ # Install the latest meson from pip, since the version in the ubuntu repos is
+ # often quite old.
+ - if test "x$BUILD" = xmeson; then
+ pip3 install --user meson;
+ fi
+
# Since libdrm gets updated in configure.ac regularly, try to pick up the
# latest version from there.
- for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do
@@ -457,6 +482,11 @@ install:
- tar -axvf $WAYLAND_PROTOCOLS_VERSION.tar.xz
- (cd $WAYLAND_PROTOCOLS_VERSION && ./configure --prefix=$HOME/prefix && make install)
+ # Meson requires ninja >= 1.6, but trusty has 1.3.x
+ - wget https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-linux.zip;
+ - unzip ninja-linux.zip
+ - mv ninja $HOME/prefix/bin/
+
# Generate the header since one is missing on the Travis instance
- mkdir -p linux
- printf "%s\n" \
@@ -496,3 +526,9 @@ script:
test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
fi
+
+ - if test "x$BUILD" = xmeson; then
+ export CC="$CC -isystem`pwd`";
+ meson _build $MESON_OPTIONS;
+ ninja -C _build test;
+ fi
More information about the mesa-commit
mailing list