mirror of
https://github.com/servo/servo.git
synced 2025-06-28 19:13:41 +01:00
Auto merge of #25761 - luka-zitnik:python-virtualenv-missing, r=jdm
Instruct intallation of python-virtualenv Fixes servo/servo#23210 Closes servo/servo#23212 <!-- Please describe your changes on the following line: --> (Re-)enable `./mach bootstrap` by requiring a separate installation step for packages python, python-pip and python-virtualenv. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #23210 <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because bootstrap command is not covered by tests <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo
GitHub
commit
7786464dad
2 changed files with 56 additions and 45 deletions
63
README.md
63
README.md
|
|
@ -64,18 +64,20 @@ pip install virtualenv
|
||||||
|
|
||||||
#### On Debian-based Linuxes
|
#### On Debian-based Linuxes
|
||||||
|
|
||||||
Please run `./mach bootstrap`.
|
``` sh
|
||||||
|
sudo apt install python-virtualenv python-pip
|
||||||
|
./mach bootstrap
|
||||||
|
```
|
||||||
|
|
||||||
If this doesn't work, file a bug, and, run the commands below:
|
If `./mach bootstrap` doesn't work, file a bug, and, run the commands below:
|
||||||
|
|
||||||
``` sh
|
``` sh
|
||||||
sudo apt install git curl autoconf libx11-dev \
|
sudo apt install git curl autoconf libx11-dev libfreetype6-dev libgl1-mesa-dri \
|
||||||
libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
|
libglib2.0-dev xorg-dev gperf g++ build-essential cmake libssl-dev \
|
||||||
gperf g++ build-essential cmake virtualenv python-pip \
|
libbz2-dev liblzma-dev libosmesa6-dev libxmu6 libxmu-dev libglu1-mesa-dev \
|
||||||
libssl-dev libbz2-dev liblzma-dev libosmesa6-dev libxmu6 libxmu-dev \
|
libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libharfbuzz-dev ccache \
|
||||||
libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev \
|
clang libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
|
||||||
libharfbuzz-dev ccache clang libunwind-dev \
|
libgstreamer-plugins-bad1.0-dev autoconf2.13 llvm-dev
|
||||||
libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev autoconf2.13 llvm-dev
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Additionally, you'll need a local copy of GStreamer with a version later than 12.0. You can place it in `support/linux/gstreamer/gst`, or run `./mach bootstrap-gstreamer` to set it up.
|
Additionally, you'll need a local copy of GStreamer with a version later than 12.0. You can place it in `support/linux/gstreamer/gst`, or run `./mach bootstrap-gstreamer` to set it up.
|
||||||
|
|
@ -116,35 +118,41 @@ sudo apt-get install cmake
|
||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
If `virtualenv` does not exist, try `python-virtualenv`.
|
|
||||||
|
|
||||||
#### On Fedora
|
#### On Fedora
|
||||||
|
|
||||||
Please run `./mach bootstrap`.
|
``` sh
|
||||||
|
sudo dnf install python2 python2-virtualenv python2-pip
|
||||||
|
./mach bootstrap
|
||||||
|
```
|
||||||
|
|
||||||
If this doesn't work, file a bug, and, run the commands below:
|
If `./mach bootstrap` doesn't work, file a bug, and, run the commands below:
|
||||||
|
|
||||||
``` sh
|
``` sh
|
||||||
sudo dnf install curl libtool gcc-c++ libXi-devel libunwind-devel \
|
sudo dnf install curl libtool gcc-c++ libXi-devel libunwind-devel \
|
||||||
freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel gperf \
|
freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel \
|
||||||
fontconfig-devel cabextract ttmkfdir python2 python2-virtualenv python2-pip expat-devel \
|
libXrandr-devel gperf fontconfig-devel cabextract ttmkfdir expat-devel \
|
||||||
rpm-build openssl-devel cmake bzip2-devel libX11-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel \
|
rpm-build openssl-devel cmake bzip2-devel libX11-devel libXcursor-devel \
|
||||||
dbus-devel ncurses-devel harfbuzz-devel ccache mesa-libGLU-devel clang clang-libs gstreamer1-devel \
|
libXmu-devel mesa-libOSMesa-devel dbus-devel ncurses-devel harfbuzz-devel \
|
||||||
|
ccache mesa-libGLU-devel clang clang-libs gstreamer1-devel \
|
||||||
gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel autoconf213
|
gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel autoconf213
|
||||||
```
|
```
|
||||||
|
|
||||||
#### On CentOS
|
#### On CentOS
|
||||||
|
|
||||||
|
``` sh
|
||||||
|
sudo yum install python-virtualenv python-pip
|
||||||
|
./mach bootstrap
|
||||||
|
```
|
||||||
|
|
||||||
Please run `./mach bootstrap`.
|
If `./mach bootstrap` doesn't work, file a bug, and, run the commands below:
|
||||||
|
|
||||||
If this doesn't work, file a bug, and, run the commands below:
|
|
||||||
|
|
||||||
``` sh
|
``` sh
|
||||||
sudo yum install curl libtool gcc-c++ libXi-devel \
|
sudo yum install curl libtool gcc-c++ libXi-devel freetype-devel \
|
||||||
freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel gperf \
|
mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel \
|
||||||
fontconfig-devel cabextract ttmkfdir python python-virtualenv python-pip expat-devel \
|
gperf fontconfig-devel cabextract ttmkfdir python expat-devel rpm-build \
|
||||||
rpm-build openssl-devel cmake3 bzip2-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel \
|
openssl-devel cmake3 bzip2-devel libXcursor-devel libXmu-devel \
|
||||||
dbus-devel ncurses-devel python34 harfbuzz-devel ccache clang clang-libs llvm-toolset-7
|
mesa-libOSMesa-devel dbus-devel ncurses-devel python34 harfbuzz-devel \
|
||||||
|
ccache clang clang-libs llvm-toolset-7
|
||||||
```
|
```
|
||||||
|
|
||||||
Build inside `llvm-toolset` and `devtoolset`:
|
Build inside `llvm-toolset` and `devtoolset`:
|
||||||
|
|
@ -159,7 +167,9 @@ with the following environmental variables set:
|
||||||
export CMAKE=cmake3
|
export CMAKE=cmake3
|
||||||
export LIBCLANG_PATH=/opt/rh/llvm-toolset-7/root/usr/lib64
|
export LIBCLANG_PATH=/opt/rh/llvm-toolset-7/root/usr/lib64
|
||||||
```
|
```
|
||||||
|
|
||||||
#### On openSUSE Linux
|
#### On openSUSE Linux
|
||||||
|
|
||||||
``` sh
|
``` sh
|
||||||
sudo zypper install libX11-devel libexpat-devel libbz2-devel Mesa-libEGL-devel Mesa-libGL-devel cabextract cmake \
|
sudo zypper install libX11-devel libexpat-devel libbz2-devel Mesa-libEGL-devel Mesa-libGL-devel cabextract cmake \
|
||||||
dbus-1-devel fontconfig-devel freetype-devel gcc-c++ git glib2-devel gperf \
|
dbus-1-devel fontconfig-devel freetype-devel gcc-c++ git glib2-devel gperf \
|
||||||
|
|
@ -167,12 +177,14 @@ sudo zypper install libX11-devel libexpat-devel libbz2-devel Mesa-libEGL-devel M
|
||||||
python-pip python-virtualenv rpm-build glu-devel ccache llvm-clang libclang autoconf213 gstreamer-devel \
|
python-pip python-virtualenv rpm-build glu-devel ccache llvm-clang libclang autoconf213 gstreamer-devel \
|
||||||
gstreamer-plugins-base-devel gstreamer-plugins-bad-devel
|
gstreamer-plugins-base-devel gstreamer-plugins-bad-devel
|
||||||
```
|
```
|
||||||
|
|
||||||
#### On Arch Linux
|
#### On Arch Linux
|
||||||
|
|
||||||
``` sh
|
``` sh
|
||||||
sudo pacman -S --needed base-devel git python2 python2-virtualenv python2-pip mesa cmake bzip2 libxmu glu \
|
sudo pacman -S --needed base-devel git python2 python2-virtualenv python2-pip mesa cmake bzip2 libxmu glu \
|
||||||
pkg-config ttf-fira-sans harfbuzz ccache llvm clang autoconf2.13 gstreamer gstreamer-vaapi
|
pkg-config ttf-fira-sans harfbuzz ccache llvm clang autoconf2.13 gstreamer gstreamer-vaapi
|
||||||
```
|
```
|
||||||
|
|
||||||
#### On Gentoo Linux
|
#### On Gentoo Linux
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
|
@ -188,6 +200,7 @@ With the following environment variable set:
|
||||||
```sh
|
```sh
|
||||||
export LIBCLANG_PATH=$(llvm-config --prefix)/lib64
|
export LIBCLANG_PATH=$(llvm-config --prefix)/lib64
|
||||||
```
|
```
|
||||||
|
|
||||||
#### On Windows (MSVC)
|
#### On Windows (MSVC)
|
||||||
|
|
||||||
1. Install Python 2.7 for Windows (https://www.python.org/downloads/release/python-2716/). The Windows x86-64 MSI installer is fine. This is required for the build system execution and many dependencies.
|
1. Install Python 2.7 for Windows (https://www.python.org/downloads/release/python-2716/). The Windows x86-64 MSI installer is fine. This is required for the build system execution and many dependencies.
|
||||||
|
|
|
||||||
|
|
@ -113,26 +113,24 @@ def linux(context, force=False):
|
||||||
# Please keep these in sync with the packages in README.md
|
# Please keep these in sync with the packages in README.md
|
||||||
pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev',
|
pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev',
|
||||||
'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++',
|
'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++',
|
||||||
'build-essential', 'cmake', 'python-pip', "libssl-dev",
|
'build-essential', 'cmake', "libssl-dev", 'libbz2-dev',
|
||||||
'libbz2-dev', 'liblzma-dev',
|
'liblzma-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev',
|
||||||
'libosmesa6-dev', 'libxmu6', 'libxmu-dev', 'libglu1-mesa-dev',
|
'libglu1-mesa-dev', 'libgles2-mesa-dev', 'libegl1-mesa-dev',
|
||||||
'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev', 'libharfbuzz-dev',
|
'libdbus-1-dev', 'libharfbuzz-dev', 'ccache', 'clang',
|
||||||
'ccache', 'clang', 'autoconf2.13', 'libunwind-dev', 'llvm-dev']
|
'autoconf2.13', 'libunwind-dev', 'llvm-dev']
|
||||||
pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', 'libunwind-devel',
|
pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
|
||||||
'mesa-libGL-devel', 'mesa-libEGL-devel', 'glib2-devel', 'libX11-devel',
|
'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel',
|
||||||
'libXrandr-devel', 'gperf', 'fontconfig-devel', 'cabextract', 'ttmkfdir',
|
'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf',
|
||||||
'python2', 'python2-virtualenv', 'python2-pip', 'expat-devel', 'rpm-build',
|
'fontconfig-devel', 'cabextract', 'ttmkfdir', 'expat-devel',
|
||||||
'openssl-devel', 'cmake', 'bzip2-devel', 'libXcursor-devel', 'libXmu-devel',
|
'rpm-build', 'openssl-devel', 'cmake', 'bzip2-devel',
|
||||||
'mesa-libOSMesa-devel', 'dbus-devel', 'ncurses-devel', 'harfbuzz-devel',
|
'libXcursor-devel', 'libXmu-devel', 'mesa-libOSMesa-devel',
|
||||||
'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel',
|
'dbus-devel', 'ncurses-devel', 'harfbuzz-devel', 'ccache',
|
||||||
'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213']
|
'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel',
|
||||||
if context.distro == "Ubuntu":
|
'gstreamer1-plugins-base-devel',
|
||||||
if context.distro_version == "14.04":
|
'gstreamer1-plugins-bad-free-devel', 'autoconf213']
|
||||||
pkgs_apt += ["python-virtualenv"]
|
if context.distro == "Ubuntu" and context.distro_version != "14.04":
|
||||||
else:
|
pkgs_apt += ['libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev',
|
||||||
pkgs_apt += ["virtualenv"]
|
'libgstreamer-plugins-bad1.0-dev']
|
||||||
pkgs_apt += ['libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev',
|
|
||||||
'libgstreamer-plugins-bad1.0-dev']
|
|
||||||
|
|
||||||
installed_something = install_linux_deps(context, pkgs_apt, pkgs_dnf, force)
|
installed_something = install_linux_deps(context, pkgs_apt, pkgs_dnf, force)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue