summaryrefslogtreecommitdiffstats
path: root/package/python3/python3-101-optional-pydoc.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-28 21:54:53 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-01-02 19:30:17 +0100
commitc24c874810054cb0185807fe797d92056207bbbe (patch)
treeb9c296f3c00a98b0c97b673de9dad441e606c030 /package/python3/python3-101-optional-pydoc.patch
parent144e21f203cf88c1768488d08e201e9579db857e (diff)
downloadbuildroot-c24c874810054cb0185807fe797d92056207bbbe.tar.gz
buildroot-c24c874810054cb0185807fe797d92056207bbbe.zip
python3: rename patches to the new convention
Note that we don't use completely sequential numbers, because patches below 100 are used to address cross-compilation issues in Python 3, while patches above 100 are used to make more Python 3 modules configurable. [Thomas: fixup commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Diffstat (limited to 'package/python3/python3-101-optional-pydoc.patch')
-rw-r--r--package/python3/python3-101-optional-pydoc.patch91
1 files changed, 0 insertions, 91 deletions
diff --git a/package/python3/python3-101-optional-pydoc.patch b/package/python3/python3-101-optional-pydoc.patch
deleted file mode 100644
index 616ccb55ca..0000000000
--- a/package/python3/python3-101-optional-pydoc.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1102,7 +1102,9 @@
- -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
-@@ -1153,7 +1155,7 @@
- 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 \
-@@ -1197,6 +1199,10 @@
- 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
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2672,6 +2672,11 @@
- 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)
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -2212,6 +2212,12 @@
- # 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],
-@@ -2236,8 +2242,7 @@
- # 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
OpenPOWER on IntegriCloud