Update SQLite, Android dependencies (#2419)
This commit is contained in:
18
scripts/vendor/sqlite-ndk.patch
vendored
Normal file
18
scripts/vendor/sqlite-ndk.patch
vendored
Normal file
@@ -0,0 +1,18 @@
|
||||
diff --git a/vendor/sqlite/src/sqlite3.c b/vendor/sqlite/src/sqlite3.c
|
||||
index 08c593e55c..e3757f968b 100644
|
||||
--- a/vendor/sqlite/src/sqlite3.c
|
||||
+++ b/vendor/sqlite/src/sqlite3.c
|
||||
@@ -39324,8 +39324,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);
|
||||
12
scripts/vendor/sqlite.sh
vendored
12
scripts/vendor/sqlite.sh
vendored
@@ -2,13 +2,19 @@
|
||||
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
|
||||
|
||||
NAME=sqlite
|
||||
VERSION=3.24.0
|
||||
ROOT=sqlite-amalgamation-3240000
|
||||
VERSION=3.45.3
|
||||
ROOT=sqlite-amalgamation-3450300
|
||||
|
||||
download "https://www.sqlite.org/2018/$ROOT.zip"
|
||||
download "https://www.sqlite.org/2024/$ROOT.zip"
|
||||
init
|
||||
extract_zip "$ROOT/sqlite3.*"
|
||||
mkdir -p include src
|
||||
mv sqlite3.h include
|
||||
mv sqlite3.c src
|
||||
file_list include src -name "*.h" -o -name "*.c"
|
||||
|
||||
# We need this patch for compiling on Android
|
||||
# See https://www.sqlite.org/src/info/f18b2524da6bbbcf
|
||||
# should be removed when we update SQLite
|
||||
# and this is included in the release
|
||||
git apply $PWD/../../scripts/vendor/sqlite-ndk.patch
|
||||
Reference in New Issue
Block a user