| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990 |
- From 6281850ee8c3fb6d93b4997833af0cca4a48947b Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Date: Wed, 23 Dec 2015 11:49:42 +0100
- 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>
- ---
- Makefile.pre.in | 6 +++++-
- configure.ac | 18 +++++++++++++-----
- setup.py | 2 +-
- 3 files changed, 19 insertions(+), 7 deletions(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index b97c21e..bdfee19 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1180,7 +1180,7 @@ LIBSUBDIRS= \
- logging csv wsgiref urllib \
- ctypes ctypes/macholib \
- idlelib idlelib/Icons \
- - distutils distutils/command $(XMLLIBSUBDIRS) \
- + distutils distutils/command \
- importlib \
- turtledemo \
- multiprocessing multiprocessing/dummy \
- @@ -1257,6 +1257,10 @@ ifeq (@CURSES@,yes)
- LIBSUBDIRS += curses
- endif
-
- +ifeq (@EXPAT@,yes)
- +LIBSUBDIRS += $(XMLLIBSUBDIRS)
- +endif
- +
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
- diff --git a/configure.ac b/configure.ac
- index 0be47b2..e6bcacc 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -2591,13 +2591,21 @@ PKG_PROG_PKG_CONFIG
- AC_SUBST(DISABLED_EXTENSIONS)
-
- # 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]),
- +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_system_expat="no"])
- + [with_expat="builtin"])
-
- -AC_MSG_RESULT($with_system_expat)
- +AC_MSG_RESULT($with_expat)
- +
- +if test "$with_expat" != "none"; then
- + EXPAT=yes
- +else
- + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat"
- + EXPAT=no
- +fi
- +AC_SUBST(EXPAT)
-
- # Check for use of the system libffi library
- AC_MSG_CHECKING(for --with-system-ffi)
- diff --git a/setup.py b/setup.py
- index 722308b..ecddb6a 100644
- --- a/setup.py
- +++ b/setup.py
- @@ -1434,7 +1434,7 @@ class PyBuildExt(build_ext):
- #
- # More information on Expat can be found at www.libexpat.org.
- #
- - if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
- + if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
- expat_inc = []
- define_macros = []
- expat_lib = ['expat']
- --
- 2.6.4
|
