diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-24 08:47:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 08:47:28 +0200 |
| commit | 35d15484fea001dbe167b675098159a95e2da19b (patch) | |
| tree | b50a3585879436dac6a1b76430eee851d237842e /platform/x11/detect.py | |
| parent | 9b3215b97730d6ceb3a9e30711642d66cf81afd0 (diff) | |
| parent | 00c03bdd2b27b1d0214a451e545fefc9affad93c (diff) | |
Merge pull request #11528 from QuLogic/openssl110
Add support for OpenSSL 1.1.0.
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index efd388e44f..f0503e8bfa 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -134,15 +134,6 @@ def configure(env): # FIXME: Check for existence of the libs before parsing their flags with pkg-config if (env['builtin_openssl'] == 'no'): - # Currently not compatible with OpenSSL 1.1.0+ - # https://github.com/godotengine/godot/issues/8624 - import subprocess - openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n') - if (openssl_version >= "1.1.0"): - print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version) - print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n") - sys.exit(255) - env.ParseConfig('pkg-config openssl --cflags --libs') if (env['builtin_libwebp'] == 'no'): |