Mesa (master): travis: install correct version of mako for each build system
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Aug 13 16:30:23 UTC 2018
Module: Mesa
Branch: master
Commit: f976d22759f4c9b7f4c811ffd21ad970a0fb4352
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f976d22759f4c9b7f4c811ffd21ad970a0fb4352
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Mon Aug 13 12:10:38 2018 +0100
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 at intel.com>
---
.travis.yml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 430c159c9c..32cd8602e6 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
More information about the mesa-commit
mailing list