From: Emil Velikov <emil.veli...@collabora.com>

The meson requirement was bumped recently to 0.45, which requires
python 3.5

On travis that is only available on xenial. Additionally we need to pull
setuptools package otherwise pip fails to install meson.

Pulling setuptools via pip, attempts to recursively attepmting to
install pip, which ends miserably. To top of up, the setuptools package
is missing an optional dependency (recommends) of python3-wheel.

So add that one as well to the list.

Fixes: 3824c8e7cda ("meson: disable asserts by default on release
builds")
Cc: Eric Engestrom <eric.engest...@intel.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 079f145a7e4..88f849be136 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ matrix:
         - VULKAN_DRIVERS="intel,amd"
         - LLVM_VERSION=6.0
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+      dist: xenial # required for python 3.5, which is needed by meson
       addons:
         apt:
           sources:
@@ -54,12 +55,16 @@ matrix:
             - libexpat1-dev
             - libelf-dev
             - python3-pip
+            # Meson
+            - python3-setuptools
+            - python3-wheel # required by setuptools, yet packaging does not 
pull it
     - env:
         - LABEL="meson loaders/classic DRI"
         - BUILD=meson
         - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau"
         - GALLIUM_DRIVERS=""
         - VULKAN_DRIVERS=""
+      dist: xenial # required for python 3.5, which is needed by meson
       addons:
         apt:
           packages:
@@ -70,6 +75,9 @@ matrix:
             - libxdamage-dev
             - libxfixes-dev
             - python3-pip
+            # Meson
+            - python3-setuptools
+            - python3-wheel # required by setuptools, yet packaging does not 
pull it
     - env:
         - LABEL="make loaders/classic DRI"
         - BUILD=make
-- 
2.18.0

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to