From b7f154eab797eb9e3f30ee364ec27fc3629e02d5 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 7 Mar 2025 15:32:09 +0100 Subject: [PATCH] package/sqlite: json extension enabled by default Since SQLite 3.38 [0] the JSON extension is enabled by default. A new Option was introduced to actively disable the extension. [1] The JSON support is very small (<4%) compared to the rest of sqlite, so enable it unconditionally: -rwxr-xr-x 1 peko peko 1470368 Mar 12 10:50 output-without/target/usr/lib/libsqlite3.so.0.8.6 -rwxr-xr-x 1 peko peko 1530232 Mar 12 10:46 output-with/target/usr/lib/libsqlite3.so.0.8.6 E.G. a delta of 59864 bytes or 3.9% [0] https://sqlite.org/releaselog/3_38_0.html [1] https://sqlite.org/json1.html#compiling_in_json_support Signed-off-by: Michael Nosthoff [Peter: unconditionally include JSON support] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/sqlite/Config.in | 6 ------ package/sqlite/sqlite.mk | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f94a7db7b0..44ee749329 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2025.02" +config BR2_PACKAGE_SQLITE_ENABLE_JSON1 + bool "Enable the JSON extensions for SQLite has been removed" + select BR2_LEGACY + help + Since SQLite 3.38 the JSON Extension is enabled by default. + config BR2_PACKAGE_ANGULARJS bool "angularjs has been removed" select BR2_LEGACY diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index ce1e369b20..12fb8b9415 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -30,12 +30,6 @@ config BR2_PACKAGE_SQLITE_ENABLE_FTS3 http://www.sqlite.org/amalgamation.html), version 3 of the full-text search engine is added to the build automatically. -config BR2_PACKAGE_SQLITE_ENABLE_JSON1 - bool "Enable the JSON extensions for SQLite" - help - When this option is defined in the amalgamation, the JSON - extensions are added to the build automatically. - config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY bool "Enable sqlite3_unlock_notify() interface" help diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index c8f12a427a..218b3f0a1d 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -25,10 +25,6 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y) SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3 endif -ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),y) -SQLITE_CFLAGS += -DSQLITE_ENABLE_JSON1 -endif - ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y) SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY endif