Skip to content

Commit b642d3b

Browse files
authored
Update SQLite3 to 3.48.0 (#134)
1 parent d9c94dd commit b642d3b

23 files changed

+1443
-1079
lines changed
16 Bytes
Binary file not shown.
16 Bytes
Binary file not shown.
2 KB
Binary file not shown.
3 KB
Binary file not shown.
11.6 MB
Binary file not shown.

external/patches/0001-Add-user-group-ids-to-docker-build.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 75d67a6ac90884b4586b0906859279781bdc7177 Mon Sep 17 00:00:00 2001
1+
From 126c1ae17bd16d4208849943b524c398b41946b1 Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Thu, 16 Jan 2025 06:29:30 -0500
3+
Date: Thu, 16 Jan 2025 07:51:28 -0500
44
Subject: [PATCH 01/10] Add user/group ids to docker build
55

66
---
77
Makefile | 17 ++++++++++-------
88
1 file changed, 10 insertions(+), 7 deletions(-)
99

1010
diff --git a/Makefile b/Makefile
11-
index a698f26..605990f 100644
11+
index c3d16d7..af2ffa5 100644
1212
--- a/Makefile
1313
+++ b/Makefile
1414
@@ -29,6 +29,9 @@ SQLITE_INCLUDE := $(shell dirname "$(SQLITE_HEADER)")
@@ -20,8 +20,8 @@ index a698f26..605990f 100644
2020
+
2121
$(SQLITE_ARCHIVE):
2222
@mkdir -p $(@D)
23-
curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2024/$(SQLITE_AMAL_PREFIX).zip || \
24-
@@ -144,10 +147,10 @@ win-arm64: $(SQLITE_UNPACKED) jni-header
23+
curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2025/$(SQLITE_AMAL_PREFIX).zip || \
24+
@@ -145,10 +148,10 @@ win-arm64: $(SQLITE_UNPACKED) jni-header
2525
./docker/dockcross-windows-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=aarch64-w64-mingw32- OS_NAME=Windows OS_ARCH=aarch64'
2626

2727
linux32: $(SQLITE_UNPACKED) jni-header
@@ -34,7 +34,7 @@ index a698f26..605990f 100644
3434

3535
freebsd32: $(SQLITE_UNPACKED) jni-header
3636
docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir empterdose/freebsd-cross-build:9.3 sh -c 'apk add bash; apk add openjdk8; apk add perl; make clean-native native OS_NAME=FreeBSD OS_ARCH=x86 CROSS_PREFIX=i386-freebsd9-'
37-
@@ -159,10 +162,10 @@ freebsd-arm64: $(SQLITE_UNPACKED) jni-header
37+
@@ -160,10 +163,10 @@ freebsd-arm64: $(SQLITE_UNPACKED) jni-header
3838
docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir gotson/freebsd-cross-build:aarch64-11.4 sh -c 'make clean-native native OS_NAME=FreeBSD OS_ARCH=aarch64 CROSS_PREFIX=aarch64-unknown-freebsd11-'
3939

4040
linux-musl32: $(SQLITE_UNPACKED) jni-header
@@ -47,7 +47,7 @@ index a698f26..605990f 100644
4747

4848
linux-musl-arm64: $(SQLITE_UNPACKED) jni-header
4949
./docker/dockcross-musl-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=aarch64-linux-musl- OS_NAME=Linux-Musl OS_ARCH=aarch64'
50-
@@ -198,14 +201,14 @@ linux-riscv64: $(SQLITE_UNPACKED) jni-header
50+
@@ -199,14 +202,14 @@ linux-riscv64: $(SQLITE_UNPACKED) jni-header
5151
./docker/dockcross-riscv64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=riscv64-unknown-linux-gnu- OS_NAME=Linux OS_ARCH=riscv64'
5252

5353
mac64: $(SQLITE_UNPACKED) jni-header

external/patches/0002-Disable-double-quoted-strings.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From f400f30d18ceae00c85350ed5f8d3d4688376a48 Mon Sep 17 00:00:00 2001
1+
From 76e4d699bb5cf28a95a5366ecce5ddaf281f997d Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Thu, 16 Jan 2025 06:29:31 -0500
3+
Date: Thu, 16 Jan 2025 07:51:29 -0500
44
Subject: [PATCH 02/10] Disable double-quoted strings
55

66
---
@@ -12,10 +12,10 @@ Subject: [PATCH 02/10] Disable double-quoted strings
1212
5 files changed, 7 insertions(+), 6 deletions(-)
1313

1414
diff --git a/Makefile b/Makefile
15-
index 605990f..5297c5c 100644
15+
index af2ffa5..4156840 100644
1616
--- a/Makefile
1717
+++ b/Makefile
18-
@@ -105,6 +105,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
18+
@@ -106,6 +106,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
1919
-DSQLITE_MAX_ATTACHED=125 \
2020
-DSQLITE_MAX_PAGE_COUNT=4294967294 \
2121
-DSQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS \

external/patches/0003-Remove-JDBC-extensions.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 58d66ed37508f69e9124e9a381a213b3feecf3aa Mon Sep 17 00:00:00 2001
1+
From 1ce10e9197aab111c27084b5f342c4b1d5e021ca Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Thu, 16 Jan 2025 06:29:32 -0500
3+
Date: Thu, 16 Jan 2025 07:51:30 -0500
44
Subject: [PATCH 03/10] Remove JDBC extensions
55

66
---
77
Makefile | 12 +-----------
88
1 file changed, 1 insertion(+), 11 deletions(-)
99

1010
diff --git a/Makefile b/Makefile
11-
index 5297c5c..50f8735 100644
11+
index 4156840..ddb6b21 100644
1212
--- a/Makefile
1313
+++ b/Makefile
14-
@@ -70,18 +70,8 @@ clean: clean-native clean-java clean-tests
14+
@@ -71,18 +71,8 @@ clean: clean-native clean-java clean-tests
1515

1616
$(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
1717
@mkdir -p $(@D)

external/patches/0004-Add-Linux-Musl-definitions.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 11c259481d84d82a83e495583516fc3a7e16e0ab Mon Sep 17 00:00:00 2001
1+
From 13d7e6a82eb90d4a1e12567e4f8dcf910954ce5d Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Thu, 16 Jan 2025 06:29:32 -0500
3+
Date: Thu, 16 Jan 2025 07:51:30 -0500
44
Subject: [PATCH 04/10] Add Linux-Musl definitions
55

66
---

external/patches/0005-Disable-Windows-arm-FreeBSD-targets.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From b4e48a62191afc983979412c409a558fb85304e0 Mon Sep 17 00:00:00 2001
1+
From 6c001bdbae4ca248a6e72f0ec2189028fe37168c Mon Sep 17 00:00:00 2001
22
From: Matthew Nelson <[email protected]>
3-
Date: Thu, 16 Jan 2025 06:29:33 -0500
3+
Date: Thu, 16 Jan 2025 07:51:31 -0500
44
Subject: [PATCH 05/10] Disable Windows arm & FreeBSD targets
55

66
---
77
Makefile | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/Makefile b/Makefile
11-
index 50f8735..3898179 100644
11+
index ddb6b21..35df43f 100644
1212
--- a/Makefile
1313
+++ b/Makefile
14-
@@ -115,7 +115,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
14+
@@ -116,7 +116,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
1515
NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
1616

1717
# For cross-compilation, install docker. See also https://github.com/dockcross/dockcross

0 commit comments

Comments
 (0)