[Mesa-dev] [PATCH 5/5] travis: add meson build for vulkan drivers.

[Dylan Baker]

Quoting Emil Velikov (2017-10-02 09:13:49)
> On 2 October 2017 at 16:51, Eric Engestrom <eric.engestrom at imgtec.com> wrote:
> > On Sunday, 2017-10-01 03:58:28 +0000, Dylan Baker wrote:
> >> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> >> ---
> >>  .travis.yml | 36 ++++++++++++++++++++++++++++++++++++
> >>  1 file changed, 36 insertions(+)
> >>
> >> diff --git a/.travis.yml b/.travis.yml
> >> index d9a8bf5a9d4..e8fff1b66ab 100644
> >> --- a/.travis.yml
> >> +++ b/.travis.yml
> >> @@ -27,6 +27,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:
> >> @@ -393,10 +394,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
> >> @@ -471,6 +496,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" \
> >> @@ -510,3 +540,9 @@ script:
> >>        test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
> >>        scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
> >>      fi
> >> +
> >> +  - if test "x$BUILD" = xmeson; then
> >> +      cp -r linux src/intel/vulkan/;
> >
> > Is this needed? This just looks weird because it's not needed for
> > the other build systems.
> >
> It's the equivalent of "export CC="$CC -isystem`pwd`"
> 
> Handling should be identical, regardless of the build system - be that
> cp or export.
> 
> -Emil

Oh, duh, I just missed that when I was reading the make path. That's a much
nicer way to handle it than with cp, I'll use the -isystem instead.

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171002/104a83e2/attachment.sig>