summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-02-01 15:23:49 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2018-02-02 15:28:52 +0000
commit4701379d967f8c42fc8cffa0e1c80dc9074bb0d5 (patch)
tree38a17e706572710bd06a8410dee6926e8239984e
parent7d1ec6d6a92f15a24377738f12e59d80bab96da3 (diff)
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.turney@dronecode.org.uk> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
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.