Mesa (master): travis: install scons from pip
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Aug 1 18:34:46 UTC 2018
Module: Mesa
Branch: master
Commit: fea0b920426ae040d6fde0c6db79f0f8b4db3100
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fea0b920426ae040d6fde0c6db79f0f8b4db3100
Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date: Wed Aug 1 17:14:56 2018 +0200
travis: install scons from pip
The ubuntu version provided by Travis is a bit old, and does not detect
correctly some C functions.
Use a more modern version through scons.
Reviewed-by: Andres Gomez <agomez at igalia.com>
---
.travis.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8b1730bec6..b0ddbe226c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -400,7 +400,6 @@ matrix:
addons:
apt:
packages:
- - scons
# Common
- xz-utils
- x11proto-xf86vidmode-dev
@@ -419,7 +418,6 @@ matrix:
addons:
apt:
packages:
- - scons
# LLVM packaging is broken and misses these dependencies
- libedit-dev
- llvm-3.3-dev
@@ -445,7 +443,6 @@ matrix:
sources:
- llvm-toolchain-trusty-5.0
packages:
- - scons
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above
@@ -502,6 +499,11 @@ install:
pip3 install --user "meson<0.45.0";
fi
+ # Install a more modern scons from pip.
+ - if test "x$BUILD" = xscons; then
+ pip2 install --user "scons>=2.4";
+ 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
More information about the mesa-commit
mailing list