From: Juan A. Suarez Romero <jasuarez@igalia.com>
Date: Mon, 10 Sep 2018 12:15:33 +0000 (+0200)
Subject: travis: use python3.5 for meson
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d631916f295d8e40e7f9e329bd285a32f2747c3c;p=mesa.git

travis: use python3.5 for meson

Newer Meson versions require python >=3.5. But in Trusty default python3
version is 3.4.x.

Install python3.5 and makes it the default version for Meson using
update-alternatives method.

CC: Jan Vesely <jano.vesely@gmail.com>
CC: Andres Gomez <agomez@igalia.com>
CC: Emil Velikov <emil.l.velikov@gmail.com>
CC: Jon Turney <jon.turney@dronecode.org.uk>
CC: Eric Engestrom <eric.engestrom@intel.com>
CC: Dylan Baker <dylan@pnwbakers.com>
Fixes: 3824c8e7cda97c3bf856 "meson: disable asserts by default on release builds"
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
---

diff --git a/.travis.yml b/.travis.yml
index 079f145a7e4..895030cc1bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,7 @@ matrix:
             - xz-utils
             - libexpat1-dev
             - libelf-dev
+            - python3.5
             - python3-pip
     - env:
         - LABEL="meson loaders/classic DRI"
@@ -69,6 +70,7 @@ matrix:
             - libx11-xcb-dev
             - libxdamage-dev
             - libxfixes-dev
+            - python3.5
             - python3-pip
     - env:
         - LABEL="make loaders/classic DRI"
@@ -490,8 +492,10 @@ before_install:
 
 install:
   # Install a more modern meson from pip, since the version in the
-  # ubuntu repos is often quite old.
+  # ubuntu repos is often quite old. This requires python>=3.5, so
+  # let's make it default
   - if test "x$BUILD" = xmeson; then
+      sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 10;
       pip3 install --user meson;
       pip3 install --user mako;
     fi