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:52 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-01-02 19:29:53 +0100
commit144e21f203cf88c1768488d08e201e9579db857e (patch)
treeb8240274bb41fdbe401a5a8baa42c8f185a33f48 /package/python3/python3-101-optional-pydoc.patch
parent8fb574fdc88e6b83f7a51d215602c9dbf08a30a3 (diff)
downloadbuildroot-144e21f203cf88c1768488d08e201e9579db857e.tar.gz
buildroot-144e21f203cf88c1768488d08e201e9579db857e.zip
python3: bump to 3.4.2
This commit bumps python3 to Python 3.4.2. Two patches had to be changed slightly to fix some minor conflicts. PYTHON3_LIBTOOL_PATH = NO was added to prevent Buildroot from trying to patch a version of libtool for which we don't have matching patches, which isn't a problem since we're anyway not using the part of the Python sources that uses libtool (it's the built-in copy of libffi, and we use the external libffi). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 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.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/python3/python3-101-optional-pydoc.patch b/package/python3/python3-101-optional-pydoc.patch
index ddd54687f8..616ccb55ca 100644
--- a/package/python3/python3-101-optional-pydoc.patch
+++ b/package/python3/python3-101-optional-pydoc.patch
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1087,7 +1087,9 @@
+@@ -1102,7 +1102,9 @@
-rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
@@ -26,7 +26,7 @@ Index: b/Makefile.pre.in
-rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1138,7 +1140,7 @@
+@@ -1153,7 +1155,7 @@
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/posix \
@@ -35,7 +35,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
test test/test_asyncio \
-@@ -1182,6 +1184,10 @@
+@@ -1197,6 +1199,10 @@
test/test_importlib/import_ test/test_importlib/source \
unittest/test unittest/test/testmock
@@ -50,7 +50,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2655,6 +2655,11 @@
+@@ -2672,6 +2672,11 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -66,7 +66,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2203,6 +2203,12 @@
+@@ -2212,6 +2212,12 @@
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -79,7 +79,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2227,8 +2233,7 @@
+@@ -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
OpenPOWER on IntegriCloud