d63e207eb8
Update CPython to 3.13.2.
The package selection logic has changed to require time64 support for
uClibc by mirroring the logic from uclibc.mk (kernel headers >=5.1).
The following patches have been removed:
- Quirking ac_cv_buggy_getaddrinfo on cross compile
* This is resolved by always assuming it's not bugged via
ac_cv_buggy_getaddrinfo=no
- Disabling lib2to3 in builds
* CPython 3.13 no longer ships lib2to3
- Fix cross compiles when host and target are on the same SOABI
* This was fixed upstream [0]
- Fixing the MULTIARCH value for musl/uClibc
* CPython 3.13 moved to new platform triplet detection logic [1] which
supports musl. uClibc does not generate a platform triplet so will
not fail the check against MULTIARCH. See also [2].
One patch has been added that fixes thread identifiers on 32bit musl.
This commit also updates the license hash, after year change. See [3].
[0]: 909d5ac295
[1]: c163d7f0b6
[2]: https://github.com/python/cpython/issues/118942
[3]: c86571e4c9
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
[Julien: fix license hash]
Signed-off-by: Julien Olivain <ju.o@free.fr>
66 lines
1.8 KiB
Diff
66 lines
1.8 KiB
Diff
From bd588150572c48da6dbb2f65eb21587f0f20dfaf Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Date: Tue, 6 Feb 2024 22:12:20 +0100
|
|
Subject: [PATCH] Add option to disable the sqlite3 module
|
|
|
|
Upstream: N/A
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
|
[ Andrey Smirnov: ported to Python 3.6 ]
|
|
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
|
|
[ Adam Duskett: ported to Python 3.10.0 ]
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
[ Vincent Fazio: ported to Python 3.13.2 ]
|
|
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
|
|
---
|
|
Makefile.pre.in | 5 ++++-
|
|
configure.ac | 7 +++++++
|
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index e88f89b91b1..88a48eb5333 100644
|
|
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -2330,7 +2330,6 @@ LIBSUBDIRS= asyncio \
|
|
pathlib \
|
|
re \
|
|
site-packages \
|
|
- sqlite3 \
|
|
sysconfig \
|
|
tkinter \
|
|
tomllib \
|
|
@@ -2493,6 +2492,10 @@ ifeq (@IDLE@,yes)
|
|
LIBSUBDIRS += idlelib idlelib/Icons
|
|
endif
|
|
|
|
+ifeq (@SQLITE3@,yes)
|
|
+LIBSUBDIRS += sqlite3
|
|
+endif
|
|
+
|
|
TEST_MODULES=@TEST_MODULES@
|
|
|
|
.PHONY: libinstall
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 8d56a24ffcb..b6d5bb3d9c5 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -4667,6 +4667,13 @@ AS_VAR_IF([posix_threads], [stub], [
|
|
AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support])
|
|
])
|
|
|
|
+AC_SUBST(SQLITE3)
|
|
+AC_ARG_ENABLE(sqlite3,
|
|
+ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
|
|
+ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
|
|
+AS_IF([test "$SQLITE3" = "no"],
|
|
+ [PY_STDLIB_MOD_SET_NA([_sqlite3])])
|
|
+
|
|
AC_SUBST(PYDOC)
|
|
|
|
AC_ARG_ENABLE(pydoc,
|
|
--
|
|
2.34.1
|
|
|