From f98c3f981643411449aba6f93178b2ca14f9a68c Mon Sep 17 00:00:00 2001
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
Date: Tue, 7 Mar 2017 22:27:34 +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>
|
[Peter: update for 2.7.16]
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
---
|
Makefile.pre.in | 6 +++++-
|
configure.ac | 5 +++++
|
setup.py | 10 +++++++---
|
3 files changed, 17 insertions(+), 4 deletions(-)
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
index 2a5e8adc61..d3ba1aeb4e 100644
|
--- a/Makefile.pre.in
|
+++ b/Makefile.pre.in
|
@@ -1062,7 +1062,7 @@ LIBSUBDIRS= lib-tk site-packages \
|
multiprocessing multiprocessing/dummy \
|
unittest \
|
lib-old \
|
- curses pydoc_data $(MACHDEPS)
|
+ curses $(MACHDEPS)
|
|
TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
|
lib-tk/test/test_ttk test test/audiodata test/capath test/data \
|
@@ -1086,6 +1086,10 @@ ifeq (@TEST_MODULES@,yes)
|
LIBSUBDIRS += $(TESTSUBDIRS)
|
endif
|
|
+ifeq (@PYDOC@,yes)
|
+LIBSUBDIRS += pydoc_data
|
+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 f257a25620..2ed4119478 100644
|
--- a/configure.ac
|
+++ b/configure.ac
|
@@ -2834,6 +2834,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 2ef5b07189..49f810f72e 100644
|
--- a/setup.py
|
+++ b/setup.py
|
@@ -2277,6 +2277,12 @@ def main():
|
# turn off warnings when deprecated modules are imported
|
import warnings
|
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
+
|
+ scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
|
+ 'Lib/smtpd.py']
|
+ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
|
+ scripts += [ 'Tools/scripts/pydoc' ]
|
+
|
setup(# PyPI Metadata (PEP 301)
|
name = "Python",
|
version = sys.version.split()[0],
|
@@ -2297,9 +2303,7 @@ def main():
|
ext_modules=[Extension('_struct', ['_struct.c'])],
|
|
# Scripts to install
|
- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
|
- 'Tools/scripts/2to3',
|
- 'Lib/smtpd.py']
|
+ scripts = scripts,
|
)
|
|
# --install-platlib
|
--
|
2.11.0
|
