Module: Mesa
Branch: master
Commit: 4701379d967f8c42fc8cffa0e1c80dc9074bb0d5
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4701379d967f8c42fc8cffa0e1c80dc9074bb0d5

Author: Jon Turney <jon.tur...@dronecode.org.uk>
Date:   Thu Feb  1 15:23:49 2018 +0000

travis: pip -> pip2

On travis, for OSX, python2 from homebrew is pre-installed. per [1]:

 python points to the macOS system Python (with no manual PATH modification)
 python2 points to Homebrew’s Python 2.7.x (if installed)
 python3 points to Homebrew’s Python 3.x (if installed)
 pip doesn't exist
 pip2 points to Homebrew’s Python 2.7.x’s pip (if installed)
 pip3 points to Homebrew’s Python 3.x’s pip (if installed)

We will end up using 'python2' for building mesa.

Just use 'pip2' instead of 'pip', as that seems to work for all platforms on
travis.

[1] https://docs.brew.sh/Homebrew-and-Python.html

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>

---

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4297de9dd6..b3dbb96468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -398,7 +398,7 @@ matrix:
             - libelf-dev
 
 install:
-  - pip install --user mako
+  - pip2 install --user mako
 
   # Install the latest meson from pip, since the version in the ubuntu repos is
   # often quite old.

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

Reply via email to