servo: Merge #7641 - Add pip as a requirement (from servo:jdm-patch-1); r=SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: 6678eece2757e1dbe9eca4cc7b8336fe84a221dc
This commit is contained in:
Josh Matthews 2015-09-16 09:39:10 -06:00
Родитель 7b02289360
Коммит a98efee391
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -27,7 +27,7 @@ On Debian-based Linuxes:
``` sh
sudo apt-get install curl freeglut3-dev \
libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
gperf g++ cmake python-virtualenv \
gperf g++ cmake python-virtualenv python-pip \
libssl-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev libglu1-mesa-dev
```
If you are on **Ubuntu 14.04** and encountered errors on installing these dependencies involving `libcheese`, see [#6158](https://github.com/servo/servo/issues/6158) for a workaround.
@ -37,14 +37,14 @@ On Fedora:
``` sh
sudo dnf install curl freeglut-devel libtool gcc-c++ libXi-devel \
freetype-devel mesa-libGL-devel glib2-devel libX11-devel libXrandr-devel gperf \
fontconfig-devel cabextract ttmkfdir python python-virtualenv expat-devel \
fontconfig-devel cabextract ttmkfdir python python-virtualenv python-pip expat-devel \
rpm-build openssl-devel cmake bzip2-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel
```
On Arch Linux:
``` sh
sudo pacman -S --needed base-devel git python2 python2-virtualenv mesa cmake bzip2 libxmu
sudo pacman -S --needed base-devel git python2 python2-virtualenv python2-pip mesa cmake bzip2 libxmu
```
Cross-compilation for Android: