summaryrefslogtreecommitdiffstats
path: root/package/python3/0018-Add-an-option-to-disable-pydoc.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-08 00:00:29 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-09 22:35:30 +0100
commit63aeae6538770ab7f4eb048373b2e8d99c26d4c5 (patch)
tree47eb9da38f1747493ba5be0dcbd232314e55af22 /package/python3/0018-Add-an-option-to-disable-pydoc.patch
parent3c98442669f173818a8cce9479ebb0806cb9f8a2 (diff)
downloadbuildroot-63aeae6538770ab7f4eb048373b2e8d99c26d4c5.tar.gz
buildroot-63aeae6538770ab7f4eb048373b2e8d99c26d4c5.zip
python3: refresh Git formatted patches
This refreshes the set of python3 patches so they apply cleanly on the v3.5.2 tag of cpython Github repository. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python3/0018-Add-an-option-to-disable-pydoc.patch')
-rw-r--r--package/python3/0018-Add-an-option-to-disable-pydoc.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/package/python3/0018-Add-an-option-to-disable-pydoc.patch b/package/python3/0018-Add-an-option-to-disable-pydoc.patch
index 670ad40c5e..f8192dde2f 100644
--- a/package/python3/0018-Add-an-option-to-disable-pydoc.patch
+++ b/package/python3/0018-Add-an-option-to-disable-pydoc.patch
@@ -1,4 +1,4 @@
-From a83b79b964700604de386800f86e5a55f53a0e17 Mon Sep 17 00:00:00 2001
+From e07206329b3a4cdecaeca7991996950f82cd8744 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
@@ -15,10 +15,10 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index d4c771a..a98ad65 100644
+index e5a4372..83fc343 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1134,7 +1134,9 @@ bininstall: altbininstall
+@@ -1160,7 +1160,9 @@ bininstall: altbininstall
-rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
@@ -28,7 +28,7 @@ index d4c771a..a98ad65 100644
-rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1184,7 +1186,7 @@ LIBSUBDIRS= tkinter \
+@@ -1210,7 +1212,7 @@ LIBSUBDIRS= tkinter \
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/posix \
@@ -37,7 +37,7 @@ index d4c771a..a98ad65 100644
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 \
+@@ -1259,6 +1261,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
@@ -49,10 +49,10 @@ index d4c771a..a98ad65 100644
LIBSUBDIRS += $(TESTSUBDIRS)
endif
diff --git a/configure.ac b/configure.ac
-index 9f3d226..e9b6d6f 100644
+index 8b8c249..eea25d4 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2894,6 +2894,11 @@ if test "$posix_threads" = "yes"; then
+@@ -2976,6 +2976,11 @@ if test "$posix_threads" = "yes"; then
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -65,10 +65,10 @@ index 9f3d226..e9b6d6f 100644
AC_SUBST(TEST_MODULES)
diff --git a/setup.py b/setup.py
-index 3feca04..137911d 100644
+index 1c3b838..2a01896 100644
--- a/setup.py
+++ b/setup.py
-@@ -2220,6 +2220,12 @@ def main():
+@@ -2253,6 +2253,12 @@ def main():
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -81,7 +81,7 @@ index 3feca04..137911d 100644
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2244,8 +2250,7 @@ def main():
+@@ -2277,8 +2283,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
@@ -92,5 +92,5 @@ index 3feca04..137911d 100644
# --install-platlib
--
-2.6.4
+2.7.4
OpenPOWER on IntegriCloud