servo: Merge #15347 - Upgrade libssl dependency on Debian (from andreastt:libssl-debian); r=mbrubeck

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

- [ ] There are tests for these changes OR
- [x] These changes do not require tests because _non-functional changes_

Source-Repo: https://github.com/servo/servo
Source-Revision: 94e3c900294372fd4bc95e694668b2b07aa1c93a
This commit is contained in:
Andreas Tolfsen 2017-02-02 10:12:57 -08:00
Родитель 2b5029bc2a
Коммит baa83662de
1 изменённых файлов: 3 добавлений и 2 удалений

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

@ -53,12 +53,13 @@ If you've already partially compiled servo but forgot to do this step, run `./ma
#### On Debian-based Linuxes #### On Debian-based Linuxes
``` sh ``` sh
sudo apt-get install git curl freeglut3-dev autoconf \ sudo apt install git curl freeglut3-dev autoconf \
libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \ libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
gperf g++ build-essential cmake virtualenv python-pip \ gperf g++ build-essential cmake virtualenv python-pip \
libssl-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev \ libssl1.0-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev \
libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-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. 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.
If `virtualenv` does not exist, try `python-virtualenv`. If `virtualenv` does not exist, try `python-virtualenv`.