76cd14167f
Along with the version bump, a number of the patches have been dropped or reworked. Compiled shared module builds are now disabled via py_cv_module_* = n/a when possible (see PY_STDLIB_MOD_SET_NA). Leveraging this method allows dropping numerous patches. Note: this method does not work when access to a compiled module is wrapped by a python-based module such as sqlite, tkinter, etc. In these cases, configure knobs are still required to disable these modules and their wrappers. Both setup.py and distutils are no longer utilized upstream, so patches have been dropped or adjusted accordingly. Patch 0007 has been dropped, the Xtensa architecture can avoid compile errors by using a toolchain with kernel headers newer than 3.17 [0]. That would require a new, non-trivial dependency to be added, but it would also need to be propagated to all packages that select python3; as we consider xtensa with old headers to be a corner case, we decide to not address the issue, and rather add an exclusion in genrandconfig to avoid the issue in autobuilders. Patch 0026 has been dropped, the issue is fixed in uClibc v1.0.37+ [1]. Note: uClibc is not generally supported by upstream CPython. While we're making assumptions about uClibc, ac_cv_func_wcsftime=no is no longer set as it was fixed in v1.0.0 [2]. Co-developed-by: Adam Duskett <adam.duskett@amarulasolutions.com> Co-developed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [See36e635d2d5] Co-developed-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com> [See687b96db4d] [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f61bf8e7d19e0a3456a7a9ed97c399e4353698dc [1]: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/libcrypt/crypt.c?id=2f6076cdaada2132b670b5ef25ad80c76a916c5a [2]: https://lists.uclibc.org/pipermail/uclibc/2014-November/048723.html Signed-off-by: Vincent Fazio <vfazio@gmail.com> [yann.morin.1998@free.fr; - extend the commit log for the xtensa headers case ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
From a8566f6ee2a2b859ba5562f2d9f06cb4d271f277 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
|
|
|
|
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>
|
|
---
|
|
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 5fad7f82fb..7b6c9811a6 100644
|
|
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \
|
|
multiprocessing multiprocessing/dummy \
|
|
re \
|
|
site-packages \
|
|
- sqlite3 \
|
|
tkinter \
|
|
tomllib \
|
|
turtledemo \
|
|
@@ -2272,6 +2271,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 561e33f550..d1c54bd67c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -4516,6 +4516,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
|
|
|