From d13f831ba8ad5507026cee895640651aaf9d2095 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 23 May 2019 20:36:09 +0200 Subject: [PATCH] sqlite3: fix arm endian issue Forum user portuquesa raised a topic (see [1]) about being unable to use Asterisk on his armeb xscale device. We narrowed it down to sqlite3. Asterisk was unable to insert a simple table into its db. In short, sqlite3 assumes little endian for every ARM device. This worked OK for 4 Byte (unaligned) access. But once upstream (back in 2015) added a function which accesses 2 Bytes (see [2]) this failed for some (if not all) ARM big endian devices. ARM CPUs are bi-endian for 4 Byte reads but not for 2 Byte reads. This patch fixes the problem by setting the endianness adequately for ARM targets, for both 32 bit and 64 bit varieties. The patch was applied upstream (see [3]). [1] https://forum.openwrt.org/t/solved-asterisk13-or-15-sqlite3-database-problem/36856 [2] https://github.com/sqlite/sqlite/commit/329428e2088aabb1db2dc6e48108b76551405a8e [3] https://www.sqlite.org/src/info/b7aad929619f7043 Signed-off-by: Sebastian Kemper --- libs/sqlite3/Makefile | 2 +- .../patches/01-sqlite-arm-endian.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 libs/sqlite3/patches/01-sqlite-arm-endian.patch diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index 234369130..0df7e0ae3 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqlite PKG_VERSION:=3260000 -PKG_RELEASE:=2 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz PKG_HASH:=5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d 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..276e05362 --- /dev/null +++ b/libs/sqlite3/patches/01-sqlite-arm-endian.patch @@ -0,0 +1,21 @@ +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -13895,12 +13895,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