1*4882a593SmuzhiyunFrom f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3*4882a593SmuzhiyunDate: Wed, 22 Feb 2017 17:15:31 -0800 4*4882a593SmuzhiyunSubject: [PATCH] Add an option to disable lib2to3 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunlib2to3 is a library to convert Python 2.x code to Python 3.x. As 7*4882a593Smuzhiyunsuch, it is probably not very useful on embedded system targets. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 10*4882a593SmuzhiyunSigned-off-by: Samuel Martin <s.martin49@gmail.com> 11*4882a593Smuzhiyun[ Andrey Smirnov: ported to Python 3.6 ] 12*4882a593SmuzhiyunSigned-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> 13*4882a593Smuzhiyun[ Adam Duskett: ported to Python 3.10.0 ] 14*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun Makefile.pre.in | 17 ++++++++++++----- 17*4882a593Smuzhiyun configure.ac | 5 +++++ 18*4882a593Smuzhiyun setup.py | 6 +++--- 19*4882a593Smuzhiyun 3 files changed, 20 insertions(+), 8 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/Makefile.pre.in b/Makefile.pre.in 22*4882a593Smuzhiyunindex 28cf88e..63fa9fb 100644 23*4882a593Smuzhiyun--- a/Makefile.pre.in 24*4882a593Smuzhiyun+++ b/Makefile.pre.in 25*4882a593Smuzhiyun@@ -1395,7 +1395,9 @@ ifeq (@PYDOC@,yes) 26*4882a593Smuzhiyun (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) 27*4882a593Smuzhiyun endif 28*4882a593Smuzhiyun -rm -f $(DESTDIR)$(BINDIR)/2to3 29*4882a593Smuzhiyun+ifeq (@LIB2TO3@,yes) 30*4882a593Smuzhiyun (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) 31*4882a593Smuzhiyun+endif 32*4882a593Smuzhiyun if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ 33*4882a593Smuzhiyun rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ 34*4882a593Smuzhiyun (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ 35*4882a593Smuzhiyun@@ -1441,7 +1443,6 @@ LIBSUBDIRS= asyncio \ 36*4882a593Smuzhiyun idlelib idlelib/Icons \ 37*4882a593Smuzhiyun importlib importlib/metadata \ 38*4882a593Smuzhiyun json \ 39*4882a593Smuzhiyun- lib2to3 lib2to3/fixes lib2to3/pgen2 \ 40*4882a593Smuzhiyun logging \ 41*4882a593Smuzhiyun multiprocessing multiprocessing/dummy \ 42*4882a593Smuzhiyun site-packages \ 43*4882a593Smuzhiyun@@ -1458,10 +1459,6 @@ LIBSUBDIRS= asyncio \ 44*4882a593Smuzhiyun TESTSUBDIRS= ctypes/test \ 45*4882a593Smuzhiyun distutils/tests \ 46*4882a593Smuzhiyun idlelib/idle_test \ 47*4882a593Smuzhiyun- lib2to3/tests \ 48*4882a593Smuzhiyun- lib2to3/tests/data \ 49*4882a593Smuzhiyun- lib2to3/tests/data/fixers \ 50*4882a593Smuzhiyun- lib2to3/tests/data/fixers/myfixes \ 51*4882a593Smuzhiyun sqlite3/test \ 52*4882a593Smuzhiyun test test/audiodata \ 53*4882a593Smuzhiyun test/capath test/cjkencodings \ 54*4882a593Smuzhiyun@@ -1535,6 +1532,14 @@ ifeq (@PYDOC@,yes) 55*4882a593Smuzhiyun LIBSUBDIRS += pydoc_data 56*4882a593Smuzhiyun endif 57*4882a593Smuzhiyun 58*4882a593Smuzhiyun+ifeq (@LIB2TO3@,yes) 59*4882a593Smuzhiyun+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 60*4882a593Smuzhiyun+TESTSUBDIRS += lib2to3/tests \ 61*4882a593Smuzhiyun+ lib2to3/tests/data \ 62*4882a593Smuzhiyun+ lib2to3/tests/data/fixers \ 63*4882a593Smuzhiyun+ lib2to3/tests/data/fixers/myfixes 64*4882a593Smuzhiyun+endif 65*4882a593Smuzhiyun+ 66*4882a593Smuzhiyun TEST_MODULES=@TEST_MODULES@ 67*4882a593Smuzhiyun libinstall: build_all $(srcdir)/Modules/xxmodule.c 68*4882a593Smuzhiyun @for i in $(SCRIPTDIR) $(LIBDEST); \ 69*4882a593Smuzhiyun@@ -1637,10 +1642,12 @@ ifeq (@PYC_BUILD@,yes) 70*4882a593Smuzhiyun -j0 -d $(LIBDEST)/site-packages -f \ 71*4882a593Smuzhiyun -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages 72*4882a593Smuzhiyun endif 73*4882a593Smuzhiyun+ifeq (@LIB2TO3@,yes) 74*4882a593Smuzhiyun -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 75*4882a593Smuzhiyun $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt 76*4882a593Smuzhiyun -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 77*4882a593Smuzhiyun $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt 78*4882a593Smuzhiyun+endif 79*4882a593Smuzhiyun 80*4882a593Smuzhiyun # bpo-21536: Misc/python-config.sh is generated in the build directory 81*4882a593Smuzhiyun # from $(srcdir)Misc/python-config.sh.in. 82*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 83*4882a593Smuzhiyunindex 9079531..34c2ba9 100644 84*4882a593Smuzhiyun--- a/configure.ac 85*4882a593Smuzhiyun+++ b/configure.ac 86*4882a593Smuzhiyun@@ -6014,6 +6014,11 @@ else 87*4882a593Smuzhiyun fi 88*4882a593Smuzhiyun AC_SUBST(TEST_MODULES) 89*4882a593Smuzhiyun 90*4882a593Smuzhiyun+AC_SUBST(LIB2TO3) 91*4882a593Smuzhiyun+ 92*4882a593Smuzhiyun+AC_ARG_ENABLE(lib2to3, 93*4882a593Smuzhiyun+ AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), 94*4882a593Smuzhiyun+ [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) 95*4882a593Smuzhiyun 96*4882a593Smuzhiyun # generate output files 97*4882a593Smuzhiyun AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) 98*4882a593Smuzhiyundiff --git a/setup.py b/setup.py 99*4882a593Smuzhiyunindex d23f148..663fd44 100644 100*4882a593Smuzhiyun--- a/setup.py 101*4882a593Smuzhiyun+++ b/setup.py 102*4882a593Smuzhiyun@@ -2722,11 +2722,11 @@ def main(): 103*4882a593Smuzhiyun import warnings 104*4882a593Smuzhiyun warnings.filterwarnings("ignore",category=DeprecationWarning) 105*4882a593Smuzhiyun 106*4882a593Smuzhiyun- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', 107*4882a593Smuzhiyun- 'Lib/smtpd.py'] 108*4882a593Smuzhiyun+ scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] 109*4882a593Smuzhiyun if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): 110*4882a593Smuzhiyun scripts += [ 'Tools/scripts/pydoc3' ] 111*4882a593Smuzhiyun- 112*4882a593Smuzhiyun+ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): 113*4882a593Smuzhiyun+ scripts += [ 'Tools/scripts/2to3' ] 114*4882a593Smuzhiyun setup(# PyPI Metadata (PEP 301) 115*4882a593Smuzhiyun name = "Python", 116*4882a593Smuzhiyun version = sys.version.split()[0], 117*4882a593Smuzhiyun-- 118*4882a593Smuzhiyun2.30.2 119*4882a593Smuzhiyun 120