From 6fcc8b7e1f415db55c6627630f622a37f6973714 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Thu, 8 Feb 2018 19:17:31 +0100 Subject: Deleting OpenSSL module and library --- platform/x11/detect.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 02bd7232c2..72265c84ad 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,9 +152,6 @@ 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_libwebp']: env.ParseConfig('pkg-config libwebp --cflags --libs') -- cgit v1.2.3 From bd3c27ba7862d50b1bf54733e9f890f7084a9ea5 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Sat, 10 Feb 2018 14:06:38 +0100 Subject: Allow building with system wide mbedtls on X11 Using builtin_mbedtls=yes is still the default as many distributions do not ship with mbedtls included. --- platform/x11/detect.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 72265c84ad..c5ef82150b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -152,6 +152,10 @@ def configure(env): # FIXME: Check for existence of the libs before parsing their flags with pkg-config + 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') -- cgit v1.2.3