bb27353014
Brings a number of bugfixes: https://docs.python.org/release/3.12.8/whatsnew/changelog.html#python-3-12-8 Refresh patches to apply without fuzz. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Julien Olivain <ju.o@free.fr>
83 lines
2.6 KiB
Diff
83 lines
2.6 KiB
Diff
From 455e500067431c19770d637ee0769b450208550f 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 | 22 ++++++++++++----------
|
|
2 files changed, 16 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index 2b0307b1282..fcddbf33e9e 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 \
|
|
@@ -2286,6 +2285,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 94bebbfd48e..a2436c0733b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -3826,17 +3826,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_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)
|
|
|
|
-AC_MSG_RESULT([$with_system_expat])
|
|
-
|
|
-AS_VAR_IF([with_system_expat], [yes], [
|
|
+AS_VAR_IF([with_expat], [system], [
|
|
LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS-""}
|
|
LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"}
|
|
LIBEXPAT_INTERNAL=
|
|
--
|
|
2.39.5
|
|
|