OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

travis: install scons from pip

Browse Source 
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@igalia.com>
This commit is contained in:
Juan A. Suarez Romero
2018-08-01 17:14:56 +02:00
parent 26d3e2b4b0
commit fea0b92042
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -400,7 +400,6 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- scons
# Common # Common
- xz-utils - xz-utils
- x11proto-xf86vidmode-dev - x11proto-xf86vidmode-dev
@@ -419,7 +418,6 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- scons
# LLVM packaging is broken and misses these dependencies # LLVM packaging is broken and misses these dependencies
- libedit-dev - libedit-dev
- llvm-3.3-dev - llvm-3.3-dev
@@ -445,7 +443,6 @@ matrix:
sources: sources:
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-5.0
packages: packages:
- scons
# LLVM packaging is broken and misses these dependencies # LLVM packaging is broken and misses these dependencies
- libedit-dev - libedit-dev
# From sources above # From sources above
@@ -502,6 +499,11 @@ install:
pip3 install --user "meson<0.45.0"; pip3 install --user "meson<0.45.0";
fi 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 # Since libdrm gets updated in configure.ac regularly, try to pick up the
# latest version from there. # latest version from there.
- for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do - for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do