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..ffa0a68a4 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqlite PKG_VERSION:=3270200 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz PKG_HASH:=50c39e85ea28b5ecfdb3f9e860afe9ba606381e21836b2849efca6a0bfe6ef6e @@ -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 diff --git a/libs/sqlite3/patches/01-sqlite-arm-endian.patch b/libs/sqlite3/patches/01-sqlite-arm-endian.patch new file mode 100644 index 000000000..65fe7715b --- /dev/null +++ b/libs/sqlite3/patches/01-sqlite-arm-endian.patch @@ -0,0 +1,21 @@ +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -13920,12 +13920,13 @@ typedef INT16_TYPE LogEst; + ** at run-time. + */ + #ifndef SQLITE_BYTEORDER +-# if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ +- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ +- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__arm__) || defined(_M_ARM64) ++# if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ ++ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ ++ defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) + # define SQLITE_BYTEORDER 1234 +-# elif defined(sparc) || defined(__ppc__) ++# elif defined(sparc) || defined(__ppc__) || \ ++ defined(__ARMEB__) || defined(__AARCH64EB__) + # define SQLITE_BYTEORDER 4321 + # else + # define SQLITE_BYTEORDER 0