From 445c616357e0ef972678175ba31704a7be9bd4b1 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sun, 22 Jun 2025 08:01:15 -0500
Subject: [PATCH 01/16] Bump SQLite to `3.49.1.0`

---
 pythonbuild/downloads.py   | 10 +++++-----
 src/verify_distribution.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py
index f59afd82..60e7f752 100644
--- a/pythonbuild/downloads.py
+++ b/pythonbuild/downloads.py
@@ -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",
diff --git a/src/verify_distribution.py b/src/verify_distribution.py
index 2131d7aa..1ac2381f 100644
--- a/src/verify_distribution.py
+++ b/src/verify_distribution.py
@@ -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:")

From a968b6eec5d140e8775d7bb2557d91aa79d703c7 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Thu, 26 Jun 2025 08:14:12 -0500
Subject: [PATCH 02/16] Use `prefix=`

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index b045bb88..9bcefb9a 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -14,7 +14,7 @@ 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"
 
 if [ "${TARGET_TRIPLE}" = "aarch64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"

From d1e3509c1f24a3ed7a6eaaac4fb1dc7199de32bc Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 11:14:43 -0500
Subject: [PATCH 03/16] Set CC/CXX

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index 9bcefb9a..6209634f 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -22,7 +22,7 @@ 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="${HOST_CC}" CXX="${HOST_CXX}" 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}
 
 make -j ${NUM_CPUS}
 make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out

From 1e595265f71804b3bcdb5b0fad86ed6778ebb8ca Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 11:14:53 -0500
Subject: [PATCH 04/16] Use a single worker for installs

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index 6209634f..c3f7d1b0 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -25,4 +25,4 @@ fi
 CC="${HOST_CC}" CXX="${HOST_CXX}" 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}
 
 make -j ${NUM_CPUS}
-make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out
+make install DESTDIR=${ROOT}/out

From b3cabc97c72ced5bdbc32a20151f50486f5be4b6 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 11:32:31 -0500
Subject: [PATCH 05/16] Set `CC_FOR_BUILD`

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index c3f7d1b0..a4b688ee 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -22,7 +22,7 @@ elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
 fi
 
-CC="${HOST_CC}" CXX="${HOST_CXX}" 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}" CXX="${HOST_CXX}" 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}
 
 make -j ${NUM_CPUS}
 make install DESTDIR=${ROOT}/out

From 1b9dbcb9fb73a943cc313987a8c1e0ffaa9e8e3b Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 11:34:35 -0500
Subject: [PATCH 06/16] Set `CC="${TARGET_CC}"`

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index a4b688ee..0ca10ba6 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -22,7 +22,7 @@ elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
 fi
 
-CC_FOR_BUILD="${HOST_CC}" CXX="${HOST_CXX}" 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="${TARGET_CC}" CC_FOR_BUILD="${HOST_CC}" CXX="${HOST_CXX}" 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}
 
 make -j ${NUM_CPUS}
 make install DESTDIR=${ROOT}/out

From b5585000f01e2803d083b9888ebae38c190e4f76 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 12:03:28 -0500
Subject: [PATCH 07/16] Use `CC=HOST_CC` instead of CC=TARGET_CC

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index 0ca10ba6..e625a0b1 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -22,7 +22,7 @@ elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
 fi
 
-CC="${TARGET_CC}" CC_FOR_BUILD="${HOST_CC}" CXX="${HOST_CXX}" 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="${HOST_CC}" CC_FOR_BUILD="${HOST_CC}" CXX="${HOST_CXX}" 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}
 
 make -j ${NUM_CPUS}
 make install DESTDIR=${ROOT}/out

From db962de97688860001cc6c9cc38e0be080803fe6 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 13:50:13 -0500
Subject: [PATCH 08/16] Only set `CC_FOR_BUILD`

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index e625a0b1..55966a6f 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -22,7 +22,7 @@ elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
 fi
 
-CC="${HOST_CC}" CC_FOR_BUILD="${HOST_CC}" CXX="${HOST_CXX}" 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}
 
 make -j ${NUM_CPUS}
 make install DESTDIR=${ROOT}/out

From a1828efc3c04c4d330413dd554ceeae6d35848f7 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 14:02:12 -0500
Subject: [PATCH 09/16] Install the g++ cross toolchains

---
 cpython-unix/build.cross.Dockerfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cpython-unix/build.cross.Dockerfile b/cpython-unix/build.cross.Dockerfile
index aa17d6c1..3ba45ec4 100644
--- a/cpython-unix/build.cross.Dockerfile
+++ b/cpython-unix/build.cross.Dockerfile
@@ -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 \
     libc6-dev-arm64-cross \
     libc6-dev-armel-cross \
     libc6-dev-armhf-cross \

From 2e17531fd85f12693ce9ee64c20fb7f407aa9e61 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 14:20:47 -0500
Subject: [PATCH 10/16] Include `g++-riscv64-linux-gnu` in riscv64 cross image

---
 cpython-unix/build.cross-riscv64.Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cpython-unix/build.cross-riscv64.Dockerfile b/cpython-unix/build.cross-riscv64.Dockerfile
index 740a098b..8c95d6d4 100644
--- a/cpython-unix/build.cross-riscv64.Dockerfile
+++ b/cpython-unix/build.cross-riscv64.Dockerfile
@@ -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 \

From 66fbfd5e48b0a9d065c20f5fa1b081d2bbd912a8 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 14:54:46 -0500
Subject: [PATCH 11/16] Use `--enable-shared=no` instead of `disable-shared`?

---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index 55966a6f..2e9755f6 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -14,7 +14,7 @@ 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 --enable-shared=no"
 
 if [ "${TARGET_TRIPLE}" = "aarch64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"

From 62a14b261bd60cf068045ec6a2e03cd64107ac2d Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 15:43:42 -0500
Subject: [PATCH 12/16] Revert "Use `--enable-shared=no` instead of
 `disable-shared`?"

This reverts commit 66fbfd5e48b0a9d065c20f5fa1b081d2bbd912a8.
---
 cpython-unix/build-sqlite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index 2e9755f6..55966a6f 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -14,7 +14,7 @@ pushd sqlite-autoconf-${SQLITE_VERSION}
 
 
 CONFIGURE_FLAGS="--build=${BUILD_TRIPLE} --host=${TARGET_TRIPLE}"
-CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --prefix=/tools/deps --enable-shared=no"
+CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --prefix=/tools/deps --disable-shared"
 
 if [ "${TARGET_TRIPLE}" = "aarch64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"

From 651e99bcf37c7db2e5e6e390c7137cbce443370b Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sat, 5 Jul 2025 16:38:25 -0500
Subject: [PATCH 13/16] Avoid `make` implicit inclusion of shared library via
 "all"

---
 cpython-unix/build-sqlite.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index 55966a6f..4f00bbee 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -24,5 +24,7 @@ fi
 
 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}
 
-make -j ${NUM_CPUS}
-make install DESTDIR=${ROOT}/out
+make -j ${NUM_CPUS} libsqlite3.a
+make install-lib DESTDIR=${ROOT}/out
+make install-headers DESTDIR=${ROOT}/out
+make install-pc DESTDIR=${ROOT}/out

From 91184f60320b154fdbf4ded8f68de4f424603e29 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sun, 6 Jul 2025 00:21:36 -0500
Subject: [PATCH 14/16] Unset CXX?

---
 cpython-unix/build-sqlite.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cpython-unix/build-sqlite.sh b/cpython-unix/build-sqlite.sh
index 4f00bbee..e01e3077 100755
--- a/cpython-unix/build-sqlite.sh
+++ b/cpython-unix/build-sqlite.sh
@@ -22,6 +22,11 @@ elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
 fi
 
+# The SQLite autosetup looks for the C++ compiler if the variable is set and will fail if it's not
+# found, even if it's not needed. We don't actually have a C++ compiler in some builds, so ensure
+# it's not looked for.
+unset CXX
+
 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}
 
 make -j ${NUM_CPUS} libsqlite3.a

From 2820aced4d6b7ab0d0f7551e74fc1c4a0709f992 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sun, 6 Jul 2025 10:54:28 -0500
Subject: [PATCH 15/16] Revert "Install the g++ cross toolchains"

This reverts commit a1828efc3c04c4d330413dd554ceeae6d35848f7.
---
 cpython-unix/build.cross.Dockerfile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cpython-unix/build.cross.Dockerfile b/cpython-unix/build.cross.Dockerfile
index 3ba45ec4..aa17d6c1 100644
--- a/cpython-unix/build.cross.Dockerfile
+++ b/cpython-unix/build.cross.Dockerfile
@@ -59,14 +59,6 @@ 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 \
     libc6-dev-arm64-cross \
     libc6-dev-armel-cross \
     libc6-dev-armhf-cross \

From 4d4b5e5f8e9f24cf2e7c8f5d7d9222b4ff13ee41 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Sun, 6 Jul 2025 10:54:33 -0500
Subject: [PATCH 16/16] Revert "Include `g++-riscv64-linux-gnu` in riscv64
 cross image"

This reverts commit 2e17531fd85f12693ce9ee64c20fb7f407aa9e61.
---
 cpython-unix/build.cross-riscv64.Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cpython-unix/build.cross-riscv64.Dockerfile b/cpython-unix/build.cross-riscv64.Dockerfile
index 8c95d6d4..740a098b 100644
--- a/cpython-unix/build.cross-riscv64.Dockerfile
+++ b/cpython-unix/build.cross-riscv64.Dockerfile
@@ -57,7 +57,6 @@ 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 \