123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102 |
- Add infrastructure to disable the build of certain extensions
- Some of the extensions part of the Python core have dependencies on
- external libraries (sqlite, tk, etc.) or are relatively big and not
- necessarly always useful (CJK codecs for example). By extensions, we
- mean part of Python modules that are written in C and therefore
- compiled to binary code.
- Therefore, we introduce a small infrastructure that allows to disable
- some of those extensions. This can be done inside the configure.in by
- adding values to the DISABLED_EXTENSIONS variable (which is a
- word-separated list of extensions).
- The implementation works as follow :
- * configure.in defines a DISABLED_EXTENSIONS variable, which is
- substituted (so that when Makefile.pre is generated from
- Makefile.pre.in, the value of the variable is substituted). For
- now, this DISABLED_EXTENSIONS variable is empty, later patches will
- use it.
- * Makefile.pre.in passes the DISABLED_EXTENSIONS value down to the
- variables passed in the environment when calling the setup.py
- script that actually builds and installs those extensions.
- * setup.py is modified so that the existing "disabled_module_list" is
- filled with those pre-disabled extensions listed in
- DISABLED_EXTENSIONS.
- Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>, and
- then extended by Thomas Petazzoni
- <thomas.petazzoni@free-electrons.com>.
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- ---
- Makefile.pre.in | 8 +++++---
- configure.in | 2 ++
- setup.py | 5 ++++-
- 3 files changed, 11 insertions(+), 4 deletions(-)
- Index: Python-2.7.1/Makefile.pre.in
- ===================================================================
- --- Python-2.7.1.orig/Makefile.pre.in
- +++ Python-2.7.1/Makefile.pre.in
- @@ -141,6 +141,8 @@
- # configure script arguments
- CONFIG_ARGS= @CONFIG_ARGS@
-
- +# disabled extensions
- +DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@
-
- # Subdirectories with code
- SRCDIRS= @SRCDIRS@
- @@ -406,8 +408,8 @@
- # Build the shared modules
- sharedmods: $(BUILDPYTHON)
- @case $$MAKEFLAGS in \
- - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py -q build;; \
- - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
- + *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py -q build;; \
- + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
- esac
-
- # Build static library
- @@ -1046,7 +1048,7 @@
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
- - $(RUNSHARED) CROSS_COMPILING=@CROSS_COMPILING@ $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py install \
- + $(RUNSHARED) CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py install \
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
- --install-platlib=$(DESTSHARED) \
- Index: Python-2.7.1/configure.in
- ===================================================================
- --- Python-2.7.1.orig/configure.in
- +++ Python-2.7.1/configure.in
- @@ -2084,6 +2084,8 @@
-
- AC_PATH_TOOL([PKG_CONFIG], [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,
- Index: Python-2.7.1/setup.py
- ===================================================================
- --- Python-2.7.1.orig/setup.py
- +++ Python-2.7.1/setup.py
- @@ -21,7 +21,10 @@
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-
- # This global variable is used to hold the list of modules to be disabled.
- -disabled_module_list = []
- +try:
- + disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
- +except KeyError:
- + disabled_module_list = list()
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
|