Skip to content
Snippets Groups Projects
Commit 37e2147d authored by Steve Lhomme's avatar Steve Lhomme Committed by Felix Paul Kühne
Browse files

contrib: sqlite: update to 3.46.1

We don't have to patch it for Android anymore.
parent cf2df443
No related branches found
No related tags found
1 merge request!5975contrib: sqlite: update to 3.46.1
Pipeline #511333 passed with stage
in 37 minutes and 51 seconds
adaa306ebacfbeeea6efe71aa964b1dee4a05ade794c55c7afad8693ed291354e9daa2449226c4dc50fbfa5919dfc9a17dea946f01171ff63d472af78cbed987 sqlite-autoconf-3340100.tar.gz
a5ba5af9c8d6440d39ba67e3d5903c165df3f1d111e299efbe7c1cca4876d4d5aecd722e0133670daa6eb5cbf8a85c6a3d9852ab507a393615fb5245a3e1a743 sqlite-autoconf-3460100.tar.gz
From e0a9935be1c506646566f6b7845eb381bb219e16 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 19 Feb 2024 12:20:46 +0000
Subject: [PATCH] Extend the strerror_r() result type discrepancy check in
os_unix.c to include the Android NDK, as reported in [forum post
3f13857fa4062301|forum:3f13857fa4062301]. The NDK's strerror_r() signature is
version-dependent, whereas this change assumes int return (POSIX semantic)
across all versions.
FossilOrigin-Name: f18b2524da6bbbcf372b292df52fbe6efa49fd6e1f1f13ef2447279d559f7a08
---
sqlite3.c | 6 +++++-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/sqlite3.c b/sqlite3.c
index 4b3d63c2c1..4663c22d94 100644
--- a/sqlite3.c
+++ b/sqlite3.c
@@ -1295,8 +1295,12 @@ static int unixLogErrorAtLine(
** available, the error message will often be an empty string. Not a
** huge problem. Incorrectly concluding that the GNU version is available
** could lead to a segfault though.
+ **
+ ** Forum post 3f13857fa4062301 reports that the Android SDK may use
+ ** int-type return, depending on its version.
*/
-#if defined(STRERROR_R_CHAR_P) || defined(__USE_GNU)
+#if (defined(STRERROR_R_CHAR_P) || defined(__USE_GNU)) \
+ && !defined(ANDROID) && !defined(__ANDROID__)
zErr =
# endif
strerror_r(iErrno, aErr, sizeof(aErr)-1);
# sqlite
SQLITE_VERSION := 3340100
SQLITE_URL := https://www.sqlite.org/2021/sqlite-autoconf-$(SQLITE_VERSION).tar.gz
SQLITE_VERSION := 3460100
SQLITE_URL := https://www.sqlite.org/2024/sqlite-autoconf-$(SQLITE_VERSION).tar.gz
PKGS += sqlite
......@@ -23,7 +23,6 @@ $(TARBALLS)/sqlite-autoconf-$(SQLITE_VERSION).tar.gz:
sqlite: sqlite-autoconf-$(SQLITE_VERSION).tar.gz .sum-sqlite
$(UNPACK)
$(call update_autoconfig,.)
$(APPLY) $(SRC)/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
$(call pkg_static, "sqlite3.pc.in")
$(MOVE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment