From 06123fac3050262a8869a86b8cec581fbca0be86 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 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) --- platform/x11/detect.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 5f7b825f5ea..2f55faf3809 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -73,11 +73,7 @@ def get_opts(): def get_flags(): - return [ - ('builtin_freetype', False), - ('builtin_libpng', False), - ('builtin_zlib', False), - ] + return [] def configure(env):