From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Fri, 24 Aug 2018 10:10:24 +0000 (+0100)
Subject: Revert "travis: use python3 for the autoconf builds"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7a4d2d1fdf3fd6dd79cda971b5b3669fc7fbc729;p=mesa.git

Revert "travis: use python3 for the autoconf builds"

This reverts commit 855af9a5a209f061355513b92f3ba4576f48d091.

Turns out the python scripts are _not_ fully python 3 compatible.
As Ilia reported using get_xmlpool.py with LANG=C produces some weird
output - see the link for details.

Even though the issue was spotted with the autoconf build, it exposes a
genuine problem with the script (and lack of lang handling of the meson
build.)

https://lists.freedesktop.org/archives/mesa-dev/2018-August/203508.html
---

diff --git a/.travis.yml b/.travis.yml
index 4ef0286a68f..90f9ec40e12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,7 +90,6 @@ matrix:
             - libx11-xcb-dev
             - libxdamage-dev
             - libxfixes-dev
-            - python3-pip
     - env:
         # NOTE: Building SWR is 2x (yes two) times slower than all the other
         # gallium drivers combined.
@@ -123,7 +122,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         - LABEL="make Gallium Drivers RadeonSI"
         - BUILD=make
@@ -153,7 +151,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         - LABEL="make Gallium Drivers Other"
         - BUILD=make
@@ -186,7 +183,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-3.9"
@@ -226,7 +222,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-4.0"
@@ -263,7 +258,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-5.0"
@@ -300,7 +294,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-6.0"
@@ -334,7 +327,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         - LABEL="make Gallium ST Other"
         - BUILD=make
@@ -371,7 +363,6 @@ matrix:
             - libx11-xcb-dev
             - libelf-dev
             - libunwind8-dev
-            - python3-pip
     - env:
         - LABEL="make Vulkan"
         - BUILD=make
@@ -400,7 +391,6 @@ matrix:
             - libexpat1-dev
             - libx11-xcb-dev
             - libelf-dev
-            - python3-pip
     - env:
         - LABEL="scons"
         - BUILD=scons
@@ -509,7 +499,7 @@ install:
 
   # Install autotools build dependencies
   - if test "x$BUILD" = xmake; then
-      pip3 install --user mako;
+      pip2 install --user mako;
     fi
 
   # Install a more modern scons from pip.