diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2018-08-13 12:10:38 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2018-08-13 17:29:42 +0100 |
| commit | f976d22759f4c9b7f4c811ffd21ad970a0fb4352 (patch) | |
| tree | fe88b4dde911fe34034f31894b8c3861cf83c2f7 /.travis.yml | |
| parent | ae5770171ccfb085a57c3ef9251c16484c47b6af (diff) | |
travis: install correct version of mako for each build system
Meson now uses python3, so let's add a block for Autotools, move that
line into the buildsys-specific blocks, and set the correct version for
Meson.
Fixes: 2ee1c86d71bee5ddca2c "meson: Build with Python 3"
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 430c159c9c5..32cd8602e6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -493,18 +493,23 @@ before_install: fi install: - - pip2 install --user mako - # Install a more modern meson from pip, since the version in the # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python # 3.5+ - if test "x$BUILD" = xmeson; then pip3 install --user "meson<0.45.0"; + pip3 install --user mako; + fi + + # Install autotools build dependencies + - if test "x$BUILD" = xmake; then + pip2 install --user mako; fi # Install a more modern scons from pip. - if test "x$BUILD" = xscons; then pip2 install --user "scons>=2.4"; + pip2 install --user mako; fi # Since libdrm gets updated in configure.ac regularly, try to pick up the |