Skip to content

Bump SQLite to 3.49.1.0 #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jul 7, 2025
Merged

Bump SQLite to 3.49.1.0 #667

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
445c616
Bump SQLite to `3.49.1.0`
zanieb Jun 22, 2025
a968b6e
Use `prefix=`
zanieb Jun 26, 2025
d1e3509
Set CC/CXX
zanieb Jul 5, 2025
1e59526
Use a single worker for installs
zanieb Jul 5, 2025
b3cabc9
Set `CC_FOR_BUILD`
zanieb Jul 5, 2025
1b9dbcb
Set `CC="${TARGET_CC}"`
zanieb Jul 5, 2025
b558500
Use `CC=HOST_CC` instead of CC=TARGET_CC
zanieb Jul 5, 2025
db962de
Only set `CC_FOR_BUILD`
zanieb Jul 5, 2025
a1828ef
Install the g++ cross toolchains
zanieb Jul 5, 2025
2e17531
Include `g++-riscv64-linux-gnu` in riscv64 cross image
zanieb Jul 5, 2025
66fbfd5
Use `--enable-shared=no` instead of `disable-shared`?
zanieb Jul 5, 2025
62a14b2
Revert "Use `--enable-shared=no` instead of `disable-shared`?"
zanieb Jul 5, 2025
651e99b
Avoid `make` implicit inclusion of shared library via "all"
zanieb Jul 5, 2025
91184f6
Unset CXX?
zanieb Jul 6, 2025
2820ace
Revert "Install the g++ cross toolchains"
zanieb Jul 6, 2025
4d4b5e5
Revert "Include `g++-riscv64-linux-gnu` in riscv64 cross image"
zanieb Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cpython-unix/build-sqlite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ pushd sqlite-autoconf-${SQLITE_VERSION}


CONFIGURE_FLAGS="--build=${BUILD_TRIPLE} --host=${TARGET_TRIPLE}"
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --prefix /tools/deps --disable-shared"
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --prefix=/tools/deps --disable-shared"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a syntax difference between autosetup and autoconf


if [ "${TARGET_TRIPLE}" = "aarch64-apple-ios" ]; then
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
fi

CFLAGS="${EXTRA_TARGET_CFLAGS} -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS3_TOKENIZER -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure ${CONFIGURE_FLAGS}
CC_FOR_BUILD="${HOST_CC}" CFLAGS="${EXTRA_TARGET_CFLAGS} -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS3_TOKENIZER -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure ${CONFIGURE_FLAGS}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The autosetup script use CC_FOR_BUILD instead of HOST_CC.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not an actual concern but -fPIC for the preprocessor (CPPFLAGS) seems unneeded, I wonder why we were doing this.


make -j ${NUM_CPUS}
make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out
make -j ${NUM_CPUS} libsqlite3.a
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make implies make all which includes the shared library despite --disable-shared

make install-lib DESTDIR=${ROOT}/out
make install-headers DESTDIR=${ROOT}/out
make install-pc DESTDIR=${ROOT}/out
1 change: 1 addition & 0 deletions cpython-unix/build.cross-riscv64.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ RUN apt-get install \
gcc-powerpc64le-linux-gnu \
gcc-riscv64-linux-gnu \
gcc-s390x-linux-gnu \
g++-riscv64-linux-gnu \
libc6-dev-arm64-cross \
libc6-dev-armel-cross \
libc6-dev-armhf-cross \
Expand Down
8 changes: 8 additions & 0 deletions cpython-unix/build.cross.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ RUN apt-get install \
gcc-mipsel-linux-gnu \
gcc-powerpc64le-linux-gnu \
gcc-s390x-linux-gnu \
g++-aarch64-linux-gnu \
g++-arm-linux-gnueabi \
g++-arm-linux-gnueabihf \
g++-mips-linux-gnu \
g++-mips64el-linux-gnuabi64 \
g++-mipsel-linux-gnu \
g++-powerpc64le-linux-gnu \
g++-s390x-linux-gnu \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need a C++ compiler for this build now.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #667 (comment)

libc6-dev-arm64-cross \
libc6-dev-armel-cross \
libc6-dev-armhf-cross \
Expand Down
10 changes: 5 additions & 5 deletions pythonbuild/downloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,11 @@
},
# Remember to update verify_distribution.py when version changed.
"sqlite": {
"url": "https://www.sqlite.org/2024/sqlite-autoconf-3470100.tar.gz",
"size": 3328564,
"sha256": "416a6f45bf2cacd494b208fdee1beda509abda951d5f47bc4f2792126f01b452",
"version": "3470100",
"actual_version": "3.47.1.0",
"url": "https://www.sqlite.org/2025/sqlite-autoconf-3490100.tar.gz",
"size": 3226385,
"sha256": "106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254",
"version": "3490100",
"actual_version": "3.49.1.0",
"library_names": ["sqlite3"],
"licenses": [],
"license_file": "LICENSE.sqlite.txt",
Expand Down
2 changes: 1 addition & 1 deletion src/verify_distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def test_hashlib(self):
def test_sqlite(self):
import sqlite3

self.assertEqual(sqlite3.sqlite_version_info, (3, 47, 1))
self.assertEqual(sqlite3.sqlite_version_info, (3, 49, 1))

# Optional SQLite3 features are enabled.
conn = sqlite3.connect(":memory:")
Expand Down