diff options
| author | Jan Andre Ikenmeyer <jan@ikenmeyer.eu> | 2019-05-15 09:27:14 +0200 |
|---|---|---|
| committer | Jan Andre Ikenmeyer <jan@ikenmeyer.eu> | 2019-05-15 09:27:14 +0200 |
| commit | 19a1a5f44d4483197b7c9a95753bb3c2cd2b122a (patch) | |
| tree | 4e6e7e959a506ad8de26f522da3b1fa56a354f21 /python/servo/bootstrap.py | |
| parent | 715f9c6653644d8bec5b6231d437ddeb3f7ba12b (diff) | |
| download | servo-19a1a5f44d4483197b7c9a95753bb3c2cd2b122a.tar.gz servo-19a1a5f44d4483197b7c9a95753bb3c2cd2b122a.zip | |
Bootstrap: Use most recent version of OpenSSL
Diffstat (limited to 'python/servo/bootstrap.py')
| -rw-r--r-- | python/servo/bootstrap.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 0b5da09501d..a38fb631eee 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -110,7 +110,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', 'python-pip', + 'build-essential', 'cmake', 'python-pip', "libssl-dev", 'libbz2-dev', 'liblzma-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev', 'libglu1-mesa-dev', 'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev', 'libharfbuzz-dev', @@ -124,13 +124,6 @@ def linux(context, force=False): 'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel', 'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213'] if context.distro == "Ubuntu": - if context.distro_version in ["17.04", "19.04"]: - pkgs_apt += ["libssl-dev"] - elif int(context.distro_version.split(".")[0]) < 17: - pkgs_apt += ["libssl-dev"] - else: - pkgs_apt += ["libssl1.0-dev"] - if context.distro_version == "14.04": pkgs_apt += ["python-virtualenv"] else: @@ -138,11 +131,6 @@ def linux(context, force=False): pkgs_apt += ['libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev', 'libgstreamer-plugins-bad1.0-dev'] - elif context.distro == "Debian" and context.distro_version == "Sid": - pkgs_apt += ["libssl-dev"] - else: - pkgs_apt += ["libssl1.0-dev"] - installed_something = install_linux_deps(context, pkgs_apt, pkgs_dnf, force) if not check_gstreamer_lib(): |