|
@@ -1,4 +1,4 @@
|
|
|
-From 13a8be57e79f2657c75391bfa524dc1ba4993b02 Mon Sep 17 00:00:00 2001
|
|
|
+From a65e5d3caf8e076d531191164c23c6240461f675 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
|
|
@@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
|
|
|
3 files changed, 20 insertions(+), 3 deletions(-)
|
|
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
|
-index 3abee36f49..6fa0549a56 100644
|
|
|
+index 204f293d53..63e3df0470 100644
|
|
|
--- a/Makefile.pre.in
|
|
|
+++ b/Makefile.pre.in
|
|
|
-@@ -1289,7 +1289,9 @@ bininstall: altbininstall
|
|
|
+@@ -1357,7 +1357,9 @@ bininstall: altbininstall
|
|
|
-rm -f $(DESTDIR)$(BINDIR)/idle3
|
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
|
|
|
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
|
|
@@ -30,16 +30,16 @@ index 3abee36f49..6fa0549a56 100644
|
|
|
-rm -f $(DESTDIR)$(BINDIR)/2to3
|
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
|
|
|
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
|
|
|
-@@ -1335,7 +1337,7 @@ LIBSUBDIRS= tkinter site-packages \
|
|
|
+@@ -1403,7 +1405,7 @@ LIBSUBDIRS= tkinter site-packages \
|
|
|
multiprocessing multiprocessing/dummy \
|
|
|
unittest \
|
|
|
venv venv/scripts venv/scripts/common venv/scripts/posix \
|
|
|
-- curses pydoc_data
|
|
|
-+ curses
|
|
|
+- curses pydoc_data \
|
|
|
++ curses \
|
|
|
+ zoneinfo
|
|
|
|
|
|
TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \
|
|
|
- tkinter/test/test_ttk test \
|
|
|
-@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes)
|
|
|
+@@ -1486,6 +1488,10 @@ ifeq (@TEST_MODULES@,yes)
|
|
|
LIBSUBDIRS += $(TESTSUBDIRS)
|
|
|
endif
|
|
|
|
|
@@ -51,10 +51,10 @@ index 3abee36f49..6fa0549a56 100644
|
|
|
@for i in $(SCRIPTDIR) $(LIBDEST); \
|
|
|
do \
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
-index b820d18c7c..f53cc86d89 100644
|
|
|
+index 92e28d02ee..174ed85a7c 100644
|
|
|
--- a/configure.ac
|
|
|
+++ b/configure.ac
|
|
|
-@@ -3234,6 +3234,12 @@ if test "$posix_threads" = "yes"; then
|
|
|
+@@ -3329,6 +3329,12 @@ if test "$posix_threads" = "yes"; then
|
|
|
AC_CHECK_FUNCS(pthread_getcpuclockid)
|
|
|
fi
|
|
|
|
|
@@ -68,10 +68,10 @@ index b820d18c7c..f53cc86d89 100644
|
|
|
|
|
|
AC_ARG_ENABLE(test-modules,
|
|
|
diff --git a/setup.py b/setup.py
|
|
|
-index bb7eb44213..748c269960 100644
|
|
|
+index 926c16f58f..1fc5fac90c 100644
|
|
|
--- a/setup.py
|
|
|
+++ b/setup.py
|
|
|
-@@ -2401,6 +2401,12 @@ def main():
|
|
|
+@@ -2586,6 +2586,12 @@ def main():
|
|
|
# turn off warnings when deprecated modules are imported
|
|
|
import warnings
|
|
|
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
|
@@ -84,7 +84,7 @@ index bb7eb44213..748c269960 100644
|
|
|
setup(# PyPI Metadata (PEP 301)
|
|
|
name = "Python",
|
|
|
version = sys.version.split()[0],
|
|
|
-@@ -2425,8 +2431,7 @@ def main():
|
|
|
+@@ -2610,8 +2616,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
|
|
@@ -95,5 +95,5 @@ index bb7eb44213..748c269960 100644
|
|
|
|
|
|
# --install-platlib
|
|
|
--
|
|
|
-2.20.1
|
|
|
+2.25.1
|
|
|
|