| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102 |
- From e6284624679a525440dc4bfddc1347f8add22fd8 Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Date: Wed, 22 Feb 2017 17:07:56 -0800
- Subject: [PATCH] Add an option to disable pydoc
- It removes 0.5 MB of data from the target plus the pydoc script
- itself.
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Signed-off-by: Samuel Martin <s.martin49@gmail.com>
- [ Andrey Smirnov: ported to Python 3.6 ]
- Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
- [ Adam Duskett: ported to Python 3.10.0 ]
- Signed-off-by: Adam Duskett <aduskett@gmail.com>
- [ Vincent Fazio: fix scripts array to reflect upstream ]
- Signed-off-by: Vincent Fazio <vfazio@gmail.com>
- ---
- Makefile.pre.in | 7 ++++++-
- configure.ac | 6 ++++++
- setup.py | 9 +++++++--
- 3 files changed, 19 insertions(+), 3 deletions(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index 5a40b7c548..e87bc1fcd3 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1877,7 +1877,9 @@ bininstall: commoninstall altbininstall
- -rm -f $(DESTDIR)$(BINDIR)/idle3
- (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
- -rm -f $(DESTDIR)$(BINDIR)/pydoc3
- +ifeq (@PYDOC@,yes)
- (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
- +endif
- -rm -f $(DESTDIR)$(BINDIR)/2to3
- (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
- if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
- @@ -1928,7 +1930,6 @@ LIBSUBDIRS= asyncio \
- lib2to3 lib2to3/fixes lib2to3/pgen2 \
- logging \
- multiprocessing multiprocessing/dummy \
- - pydoc_data \
- re \
- site-packages \
- sqlite3 \
- @@ -2069,6 +2070,10 @@ TESTSUBDIRS= ctypes/test \
- unittest/test \
- unittest/test/testmock
-
- +ifeq (@PYDOC@,yes)
- +LIBSUBDIRS += pydoc_data
- +endif
- +
- TEST_MODULES=@TEST_MODULES@
- libinstall: all $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- diff --git a/configure.ac b/configure.ac
- index b4d7d2cca6..d56d8f9d1c 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -4222,6 +4222,12 @@ AS_VAR_IF([posix_threads], [stub], [
- AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support])
- ])
-
- +AC_SUBST(PYDOC)
- +
- +AC_ARG_ENABLE(pydoc,
- + AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
- + [ PYDOC="${enableval}" ], [ PYDOC=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 53b066cb18..25e6f4fc26 100644
- --- a/setup.py
- +++ b/setup.py
- @@ -1597,6 +1597,12 @@ class DummyProcess:
- # turn off warnings when deprecated modules are imported
- import warnings
- warnings.filterwarnings("ignore",category=DeprecationWarning)
- +
- + scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3']
- +
- + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
- + scripts += [ 'Tools/scripts/pydoc3' ]
- +
- setup(# PyPI Metadata (PEP 301)
- name = "Python",
- version = sys.version.split()[0],
- @@ -1621,8 +1627,7 @@ class DummyProcess:
- # If you change the scripts installed here, you also need to
- # check the PyBuildScripts command above, and change the links
- # created by the bininstall target in Makefile.pre.in
- - scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
- - "Tools/scripts/2to3"]
- + scripts = scripts
- )
-
- # --install-platlib
- --
- 2.34.1
|
