| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 |
- From d7f419246681e12f05e2eefc79286959c6aa18ab Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Date: Tue, 7 Mar 2017 22:27:49 +0100
- Subject: [PATCH] Add an option to disable lib2to3
- lib2to3 is a library to convert Python 2.x code to Python 3.x. As
- such, it is probably not very useful on embedded system targets.
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Signed-off-by: Samuel Martin <s.martin49@gmail.com>
- [Peter: update for 2.7.16]
- Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
- ---
- Makefile.pre.in | 11 ++++++++---
- configure.ac | 6 ++++++
- setup.py | 5 +++--
- 3 files changed, 17 insertions(+), 5 deletions(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index d3ba1aeb4e..0e15b6d6f4 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1055,7 +1055,6 @@ LIBSUBDIRS= lib-tk site-packages \
- json \
- sqlite3 \
- logging bsddb csv importlib wsgiref \
- - lib2to3 lib2to3/fixes lib2to3/pgen2 \
- ctypes ctypes/macholib \
- idlelib idlelib/Icons \
- distutils distutils/command $(XMLLIBSUBDIRS) \
- @@ -1075,8 +1074,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- json/tests \
- sqlite3/test \
- bsddb/test \
- - lib2to3/tests \
- - lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
- ctypes/test \
- idlelib/idle_test \
- distutils/tests \
- @@ -1090,6 +1087,14 @@ ifeq (@PYDOC@,yes)
- LIBSUBDIRS += pydoc_data
- endif
-
- +ifeq (@LIB2TO3@,yes)
- +LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
- +TESTSUBDIRS += lib2to3/tests \
- + lib2to3/tests/data \
- + lib2to3/tests/data/fixers \
- + lib2to3/tests/data/fixers/myfixes
- +endif
- +
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
- diff --git a/configure.ac b/configure.ac
- index 2ed4119478..a2810ab8ed 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(test-modules,
- AS_HELP_STRING([--disable-test-modules], [disable test modules]),
- [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
-
- +AC_SUBST(LIB2TO3)
- +
- +AC_ARG_ENABLE(lib2to3,
- + AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
- + [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
- +
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
- diff --git a/setup.py b/setup.py
- index 49f810f72e..9130819454 100644
- --- a/setup.py
- +++ b/setup.py
- @@ -2278,10 +2278,11 @@ def main():
- import warnings
- warnings.filterwarnings("ignore",category=DeprecationWarning)
-
- - scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
- - 'Lib/smtpd.py']
- + scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
- if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
- scripts += [ 'Tools/scripts/pydoc' ]
- + if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
- + scripts += [ 'Tools/scripts/2to3' ]
-
- setup(# PyPI Metadata (PEP 301)
- name = "Python",
- --
- 2.11.0
|
