Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sqlite3: always build a thread-safe library

Browse source 
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>
This commit is contained in:
Sebastian Kemper 2019-05-23 19:55:43 +02:00
parent 279c09d0b2
commit 31fcfa2e24
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/sqlite3/Config-lib.in
View file

@ -44,10 +44,4 @@ config SQLITE3_SESSION
help help
Enable the session extension (default no). Enable the session extension (default no).
config SQLITE3_THREADSAFE
bool "Thread-safe library"
default y
help
Build a thread-safe library.
endmenu endmenu

7
libs/sqlite3/Makefile
View file

@ -37,8 +37,7 @@ PKG_CONFIG_DEPENDS := \
CONFIG_SQLITE3_LIBEDIT \ CONFIG_SQLITE3_LIBEDIT \
CONFIG_SQLITE3_READLINE \ CONFIG_SQLITE3_READLINE \
CONFIG_SQLITE3_RTREE \ CONFIG_SQLITE3_RTREE \
CONFIG_SQLITE3_SESSION \ CONFIG_SQLITE3_SESSION
CONFIG_SQLITE3_THREADSAFE
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -105,14 +104,14 @@ CONFIGURE_ARGS += \
--disable-static-shell \ --disable-static-shell \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--enable-threadsafe \
$(if $(CONFIG_SQLITE3_DYNAMIC_EXTENSIONS),--enable-dynamic-extensions,--disable-dynamic-extensions) \ $(if $(CONFIG_SQLITE3_DYNAMIC_EXTENSIONS),--enable-dynamic-extensions,--disable-dynamic-extensions) \
$(if $(CONFIG_SQLITE3_FTS3),--enable-fts3,--disable-fts3) \ $(if $(CONFIG_SQLITE3_FTS3),--enable-fts3,--disable-fts3) \
$(if $(CONFIG_SQLITE3_FTS3),--enable-fts4,--disable-fts4) \ $(if $(CONFIG_SQLITE3_FTS3),--enable-fts4,--disable-fts4) \
$(if $(CONFIG_SQLITE3_FTS3),--enable-fts5,--disable-fts5) \ $(if $(CONFIG_SQLITE3_FTS3),--enable-fts5,--disable-fts5) \
$(if $(CONFIG_SQLITE3_JSON1),--enable-json1,--disable-json1) \ $(if $(CONFIG_SQLITE3_JSON1),--enable-json1,--disable-json1) \
$(if $(CONFIG_SQLITE3_RTREE),--enable-rtree,--disable-rtree) \ $(if $(CONFIG_SQLITE3_RTREE),--enable-rtree,--disable-rtree) \
$(if $(CONFIG_SQLITE3_SESSION),--enable-session,--disable-session) \ $(if $(CONFIG_SQLITE3_SESSION),--enable-session,--disable-session)
$(if $(CONFIG_SQLITE3_THREADSAFE),--enable-threadsafe,--disable-threadsafe)
ifeq ($(CONFIG_SQLITE3_LIBEDIT),y) ifeq ($(CONFIG_SQLITE3_LIBEDIT),y)
CONFIGURE_ARGS+=--disable-readline CONFIGURE_ARGS+=--disable-readline