Properly handle virtualenv

This commit is contained in:
Manish Goregaokar 2018-09-03 14:25:59 +05:30
parent fcc06b5a16
commit 6b75aa47cb
2 changed files with 17 additions and 4 deletions

View file

@ -78,7 +78,9 @@ If you've already partially compiled servo but forgot to do this step, run `./ma
#### On Debian-based Linuxes
Simply running `./mach bootstrap` should be enough. If not, run the commands below:
Please run `sudo apt install python-virtualenv build-essential libssl-dev libffi-dev python-dev` followed by `./mach bootstrap`.
If this doesn't work, file a bug, and, run the commands below:
``` sh
sudo apt install git curl autoconf libx11-dev \
@ -101,7 +103,9 @@ If `virtualenv` does not exist, try `python-virtualenv`.
#### On Fedora
Simply running `./mach bootstrap` should be enough. If not, run the commands below:
Please run `sudo dnf install python2-virtualenv gcc libffi-devel python-devel openssl-devel` followed by `./mach bootstrap`.
If this doesn't work, file a bug, and, run the commands below:
``` sh
sudo dnf install curl libtool gcc-c++ libXi-devel \
@ -113,7 +117,10 @@ sudo dnf install curl libtool gcc-c++ libXi-devel \
```
#### On CentOS
Simply running `./mach bootstrap` should be enough. If not, run the commands below:
Please run `sudo yum install python2-virtualenv gcc libffi-devel python-devel openssl-devel` followed by `./mach bootstrap`.
If this doesn't work, file a bug, and, run the commands below:
``` sh
sudo yum install curl libtool gcc-c++ libXi-devel \

View file

@ -67,7 +67,7 @@ def linux(context, force=False):
# Please keep these in sync with the packages in README.md
pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev',
'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++',
'build-essential', 'cmake', 'virtualenv', 'python-pip',
'build-essential', 'cmake', 'python-pip',
'libbz2-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev', 'libglu1-mesa-dev',
'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev', 'libharfbuzz-dev',
'ccache', 'clang', 'libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev',
@ -87,6 +87,12 @@ def linux(context, force=False):
pkgs_apt += ["libssl-dev"]
else:
pkgs_apt += ["libssl1.0-dev"]
if context.distro_version == "14.04":
pkgs_apt += ["python-virtualenv"]
else:
pkgs_apt += ["virtualenv"]
elif context.distro == "Debian" and context.distro_version == "Sid":
pkgs_apt += ["libssl-dev"]
else: