sqlite3: always build a thread-safe library

Pull request #9033 showed that there are problems with builds where
thread-safe mode is disabled. The binaries still reference functions
from libpthread. This commit removes the thread-safe choice for now.
Once this is addressed upstream the choice can be added back.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/libs/sqlite3/Config-lib.in b/libs/sqlite3/Config-lib.in
index aa6357b53c02cf5ce7ec3fd1aeeedf97d3551794..6e7ea18dcf5d58ed0c9ba3319c356310204850b7 100644 (file)
--- a/libs/sqlite3/Config-lib.in
+++ b/libs/sqlite3/Config-lib.in
@@ -44,10 +44,4 @@ config SQLITE3_SESSION
        help
          Enable the session extension (default no).
 
-config SQLITE3_THREADSAFE
-       bool "Thread-safe library"
-       default y
-       help
-         Build a thread-safe library.
-
 endmenu

diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index 1ceffa03602211ea3bb1826985a50e808b70afea..059efa6f11b03c955b20493fb03b2d2e804d394d 100644 (file)
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -37,8 +37,7 @@ PKG_CONFIG_DEPENDS := \
        CONFIG_SQLITE3_LIBEDIT \
        CONFIG_SQLITE3_READLINE \
        CONFIG_SQLITE3_RTREE \
-       CONFIG_SQLITE3_SESSION \
-       CONFIG_SQLITE3_THREADSAFE
+       CONFIG_SQLITE3_SESSION
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -105,14 +104,14 @@ CONFIGURE_ARGS += \
        --disable-static-shell \
        --enable-shared \
        --enable-static \
+       --enable-threadsafe \
        $(if $(CONFIG_SQLITE3_DYNAMIC_EXTENSIONS),--enable-dynamic-extensions,--disable-dynamic-extensions) \
        $(if $(CONFIG_SQLITE3_FTS3),--enable-fts3,--disable-fts3) \
        $(if $(CONFIG_SQLITE3_FTS3),--enable-fts4,--disable-fts4) \
        $(if $(CONFIG_SQLITE3_FTS3),--enable-fts5,--disable-fts5) \
        $(if $(CONFIG_SQLITE3_JSON1),--enable-json1,--disable-json1) \
        $(if $(CONFIG_SQLITE3_RTREE),--enable-rtree,--disable-rtree) \
-       $(if $(CONFIG_SQLITE3_SESSION),--enable-session,--disable-session) \
-       $(if $(CONFIG_SQLITE3_THREADSAFE),--enable-threadsafe,--disable-threadsafe)
+       $(if $(CONFIG_SQLITE3_SESSION),--enable-session,--disable-session)
 
 ifeq ($(CONFIG_SQLITE3_LIBEDIT),y)
 CONFIGURE_ARGS+=--disable-readline