| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596 |
- From a83b79b964700604de386800f86e5a55f53a0e17 Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Date: Wed, 23 Dec 2015 11:47:11 +0100
- 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>
- ---
- Makefile.pre.in | 8 +++++++-
- configure.ac | 5 +++++
- setup.py | 9 +++++++--
- 3 files changed, 19 insertions(+), 3 deletions(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index d4c771a..a98ad65 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1134,7 +1134,9 @@ bininstall: 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)
- -rm -f $(DESTDIR)$(BINDIR)/pyvenv
- @@ -1184,7 +1186,7 @@ LIBSUBDIRS= tkinter \
- multiprocessing multiprocessing/dummy \
- unittest \
- venv venv/scripts venv/scripts/posix \
- - curses pydoc_data $(MACHDEPS)
- + curses $(MACHDEPS)
-
- TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
- test test/test_asyncio \
- @@ -1233,6 +1235,10 @@ TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
- test/test_importlib/import_ test/test_importlib/source \
- unittest/test unittest/test/testmock
-
- +ifeq (@PYDOC@,yes)
- +LIBSUBDIRS += pydoc_data
- +endif
- +
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
- diff --git a/configure.ac b/configure.ac
- index 9f3d226..e9b6d6f 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -2894,6 +2894,11 @@ if test "$posix_threads" = "yes"; then
- AC_CHECK_FUNCS(pthread_atfork)
- fi
-
- +AC_SUBST(PYDOC)
- +
- +AC_ARG_ENABLE(pydoc,
- + AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
- + [ PYDOC="${enableval}" ], [ PYDOC=yes ])
-
- AC_SUBST(TEST_MODULES)
-
- diff --git a/setup.py b/setup.py
- index 3feca04..137911d 100644
- --- a/setup.py
- +++ b/setup.py
- @@ -2220,6 +2220,12 @@ def main():
- # turn off warnings when deprecated modules are imported
- import warnings
- warnings.filterwarnings("ignore",category=DeprecationWarning)
- +
- + scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3',
- + 'Lib/smtpd.py']
- + 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],
- @@ -2244,8 +2250,7 @@ def main():
- # 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", "Tools/scripts/pyvenv"]
- + scripts = scripts,
- )
-
- # --install-platlib
- --
- 2.6.4
|
