mirror of
https://github.com/servo/servo.git
synced 2025-08-09 23:45:35 +01:00
Auto merge of #23392 - Darkspirit:tc_openssl1.1, r=jdm
Build Linux Nightly with OpenSSL 1.1.0 Servo Nightly fails to run on Ubuntu 19.04 (disco) as it doesn't have a libssl1.0.0 package. OpenSSL 1.1.x is supported since [Debian Stretch](https://packages.debian.org/en/stretch/libssl1.1) (currently Debian Stable) and [Ubuntu 18.04](https://packages.ubuntu.com/bionic/libssl1.1) (used by base.dockerfile). Ancient Debian + Ubuntu releases are still able to compile Servo using their most recent OpenSSL (1.0.x). --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #12015, fix #21778 and fix #22110 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23392) <!-- Reviewable:end -->
This commit is contained in:
commit
c1c60d0fc4
4 changed files with 4 additions and 17 deletions
|
@ -24,7 +24,7 @@ RUN \
|
|||
libgstreamer-plugins-bad1.0-dev \
|
||||
#
|
||||
# OpenSSL
|
||||
libssl1.0-dev \
|
||||
libssl-dev \
|
||||
#
|
||||
# blurz
|
||||
libdbus-1-dev \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Servo’s runtime dependencies
|
||||
RUN apt-get install -qy --no-install-recommends \
|
||||
libgl1 \
|
||||
libssl1.0.0 \
|
||||
libssl1.1 \
|
||||
libdbus-1-3 \
|
||||
libgstreamer-plugins-bad1.0-0 \
|
||||
gstreamer1.0-plugins-good
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue