diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2019-05-23 19:55:43 +0200 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2019-05-23 19:59:50 +0200 |
| commit | 31fcfa2e2469dae7aa52b39c4e5698d39afe36d9 (patch) | |
| tree | 784b761881b1a3f882b67f48e6d0b6cf9691f29a | |
| parent | 279c09d0b24f72a7751620edd915da1868adb6f3 (diff) | |
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>
| -rw-r--r-- | libs/sqlite3/Config-lib.in | 6 | ||||
| -rw-r--r-- | libs/sqlite3/Makefile | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/libs/sqlite3/Config-lib.in b/libs/sqlite3/Config-lib.in index aa6357b53..6e7ea18dc 100644 --- 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 1ceffa036..059efa6f1 100644 --- 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 |