diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-14 08:00:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 08:00:47 +0100 |
| commit | ac5cce5e9513eba34745f7e1e90c320ec92390f9 (patch) | |
| tree | 0ccca56f5fbc3fde1bc00ee72e272b842329c62f /platform/x11/detect.py | |
| parent | e7351ecdf5f14f1b6a8733f91fd90646406d77a5 (diff) | |
| parent | bd3c27ba7862d50b1bf54733e9f890f7084a9ea5 (diff) | |
Merge pull request #16519 from Faless/mbedtls
Replace OpenSSL with mbedTLS
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 02bd7232c2..c5ef82150b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -65,7 +65,6 @@ def get_flags(): return [ ('builtin_freetype', False), ('builtin_libpng', False), - ('builtin_openssl', False), ('builtin_zlib', False), ] @@ -153,8 +152,9 @@ def configure(env): # FIXME: Check for existence of the libs before parsing their flags with pkg-config - if not env['builtin_openssl']: - env.ParseConfig('pkg-config openssl --cflags --libs') + if not env['builtin_mbedtls']: + # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228 + env.Append(LIBS=['mbedtls', 'mbedcrypto', 'mbedx509']) if not env['builtin_libwebp']: env.ParseConfig('pkg-config libwebp --cflags --libs') |