From e284ea344d21b0cd0f58ab4677346f4c95e67348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 23 Jun 2019 10:02:24 +0200 Subject: [PATCH] SCons: Default to builtin libpng/freetype on Linux (+ openssl) The rationale for keeping those shared by default is that they're typical dependencies found on any Linux system, and it saves compilation time and binary size to link their dynamically. But since official builds default to all-builtin, and Debian/Ubuntu still don't have libpng16 (which we now require) readily available on all their supported releases, it's simpler to bundle all the things. This does not change the fact that those dependencies *can* be unbundled on Linux, it's only the default option changing. (cherry picked from commit 1769cbc0e24c13f4d31d7e0857275653ec9281e0) For 3.0, also building by default against bundled openssl. --- platform/x11/detect.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 1f4d185f3c3..a565b5e11ff 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -62,12 +62,7 @@ def get_opts(): def get_flags(): - return [ - ('builtin_freetype', False), - ('builtin_libpng', False), - ('builtin_openssl', False), - ('builtin_zlib', False), - ] + return [] def configure(env):