| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384 |
- 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>
- ---
- Makefile.pre.in | 6 +++++-
- configure.in | 18 +++++++++++++-----
- setup.py | 2 +-
- 3 files changed, 19 insertions(+), 7 deletions(-)
- Index: Python-2.7.2/Makefile.pre.in
- ===================================================================
- --- Python-2.7.2.orig/Makefile.pre.in
- +++ Python-2.7.2/Makefile.pre.in
- @@ -863,7 +863,7 @@
- sqlite3 \
- logging bsddb csv importlib wsgiref \
- ctypes ctypes/macholib idlelib idlelib/Icons \
- - distutils distutils/command $(XMLLIBSUBDIRS) \
- + distutils distutils/command \
- multiprocessing multiprocessing/dummy \
- unittest \
- lib-old \
- @@ -910,6 +910,10 @@
- LIBSUBDIRS += curses
- endif
-
- +ifeq (@EXPAT@,yes)
- +LIBSUBDIRS += $(XMLLIBSUBDIRS)
- +endif
- +
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
- Index: Python-2.7.2/configure.in
- ===================================================================
- --- Python-2.7.2.orig/configure.in
- +++ Python-2.7.2/configure.in
- @@ -2102,13 +2102,21 @@
- 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)
- Index: Python-2.7.2/setup.py
- ===================================================================
- --- Python-2.7.2.orig/setup.py
- +++ Python-2.7.2/setup.py
- @@ -1403,7 +1403,7 @@
- #
- # 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']
|
