mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-31 19:51:06 -09:00
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>
84 lines
2.6 KiB
Diff
84 lines
2.6 KiB
Diff
From d1701f1c89e9d2319ede200052319183fbb4ae18 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Wed, 22 Feb 2017 17:40:45 -0800
|
|
Subject: [PATCH] Add an option to disable expat
|
|
|
|
This patch replaces the existing --with-system-expat option with a
|
|
--with-expat={system,builtin,none} option, which allows to tell Python
|
|
whether we want to use the system expat (already installed), the expat
|
|
builtin the Python sources, or no expat at all (which disables the
|
|
installation of XML modules).
|
|
|
|
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>
|
|
---
|
|
Makefile.pre.in | 5 ++++-
|
|
configure.ac | 24 +++++++++++++-----------
|
|
2 files changed, 17 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index 283ca1bd60..13f7512f42 100644
|
|
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -2113,7 +2113,6 @@ LIBSUBDIRS= asyncio \
|
|
urllib \
|
|
venv venv/scripts venv/scripts/common venv/scripts/posix \
|
|
wsgiref \
|
|
- $(XMLLIBSUBDIRS) \
|
|
xmlrpc \
|
|
zipfile zipfile/_path \
|
|
zoneinfo \
|
|
@@ -2280,6 +2279,10 @@ ifeq (@SQLITE3@,yes)
|
|
LIBSUBDIRS += sqlite3
|
|
endif
|
|
|
|
+ifeq (@EXPAT@,yes)
|
|
+LIBSUBDIRS += $(XMLLIBSUBDIRS)
|
|
+endif
|
|
+
|
|
TEST_MODULES=@TEST_MODULES@
|
|
|
|
.PHONY: libinstall
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 92d663ed40..1cb95f41fd 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -3823,17 +3823,19 @@ LIBS="$withval $LIBS"
|
|
[AC_MSG_RESULT([no])])
|
|
|
|
# Check for use of the system expat library
|
|
-AC_MSG_CHECKING([for --with-system-expat])
|
|
-AC_ARG_WITH(
|
|
- [system_expat],
|
|
- [AS_HELP_STRING(
|
|
- [--with-system-expat],
|
|
- [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]
|
|
- )], [], [with_system_expat="no"])
|
|
-
|
|
-AC_MSG_RESULT([$with_system_expat])
|
|
-
|
|
-AS_VAR_IF([with_system_expat], [yes], [
|
|
+AC_MSG_CHECKING(for --with-expat)
|
|
+AC_ARG_WITH(expat,
|
|
+ AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]),
|
|
+ [],
|
|
+ [with_expat="builtin"])
|
|
+AC_MSG_RESULT($with_expat)
|
|
+AS_IF([test "$with_expat" != "none"],
|
|
+ [EXPAT=yes],
|
|
+ [PY_STDLIB_MOD_SET_NA([pyexpat])
|
|
+ EXPAT=no])
|
|
+AC_SUBST(EXPAT)
|
|
+
|
|
+AS_VAR_IF([with_expat], [system], [
|
|
LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS-""}
|
|
LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"}
|
|
LIBEXPAT_INTERNAL=
|
|
--
|
|
2.34.1
|
|
|