Vincent Fazio
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>
82 lines
2.5 KiB
Diff
82 lines
2.5 KiB
Diff
From c1ec9fa46cd7679fd009f66a3ebed8de95d84f10 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Wed, 22 Feb 2017 17:23:42 -0800
|
|
Subject: [PATCH] Add an option to disable the tk 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>
|
|
[ Bernd Kuhls: ported to Python 3.11.4]
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
[ Adam Duskett: ported to Python 3.12.1 ]
|
|
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
|
|
---
|
|
Makefile.pre.in | 8 +++++---
|
|
configure.ac | 7 +++++++
|
|
2 files changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index 7b6c9811a6..6d9527ddd0 100644
|
|
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \
|
|
multiprocessing multiprocessing/dummy \
|
|
re \
|
|
site-packages \
|
|
- tkinter \
|
|
tomllib \
|
|
turtledemo \
|
|
unittest \
|
|
@@ -2212,7 +2211,6 @@ TESTSUBDIRS= idlelib/idle_test \
|
|
test/test_peg_generator \
|
|
test/test_pydoc \
|
|
test/test_sqlite3 \
|
|
- test/test_tkinter \
|
|
test/test_tomllib \
|
|
test/test_tomllib/data \
|
|
test/test_tomllib/data/invalid \
|
|
@@ -2232,7 +2230,6 @@ TESTSUBDIRS= idlelib/idle_test \
|
|
test/test_tomllib/data/valid/dates-and-times \
|
|
test/test_tomllib/data/valid/multiline-basic-str \
|
|
test/test_tools \
|
|
- test/test_ttk \
|
|
test/test_unittest \
|
|
test/test_unittest/testmock \
|
|
test/test_warnings \
|
|
@@ -2253,6 +2250,11 @@ TESTSUBDIRS= idlelib/idle_test \
|
|
test/test_multiprocessing_forkserver \
|
|
test/test_multiprocessing_spawn
|
|
|
|
+ifeq (@TK@,yes)
|
|
+LIBSUBDIRS += tkinter
|
|
+TESTSUBDIRS += test/test_tkinter test/test_ttk
|
|
+endif
|
|
+
|
|
COMPILEALL_OPTS=-j0
|
|
|
|
ifeq (@PYDOC@,yes)
|
|
diff --git a/configure.ac b/configure.ac
|
|
index d1c54bd67c..4c5cbe4153 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -4529,6 +4529,13 @@ AC_ARG_ENABLE(pydoc,
|
|
AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
|
|
[ PYDOC="${enableval}" ], [ PYDOC=yes ])
|
|
|
|
+AC_SUBST(TK)
|
|
+AC_ARG_ENABLE(tk,
|
|
+ AS_HELP_STRING([--disable-tk], [disable tk]),
|
|
+ [ TK="${enableval}" ], [ TK=yes ])
|
|
+AS_IF([test "$TK" = "no"],
|
|
+ [PY_STDLIB_MOD_SET_NA([_tkinter])])
|
|
+
|
|
# Check for enable-ipv6
|
|
AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified])
|
|
AC_MSG_CHECKING([if --enable-ipv6 is specified])
|
|
--
|
|
2.34.1
|
|
|