summaryrefslogtreecommitdiffstats
path: root/package/python/101-optional-pydoc.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-16 23:36:11 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-06-22 23:13:46 +0200
commit7076e6f61cbcd45f463eb70ab1ffbb8ff7f27819 (patch)
treeb2c3e2d0f9c837c9407a1b196a9fb80054213705 /package/python/101-optional-pydoc.patch
parentd98eed3222c928914e6d10a4ac62bc107c2dc5e9 (diff)
downloadbuildroot-7076e6f61cbcd45f463eb70ab1ffbb8ff7f27819.tar.gz
buildroot-7076e6f61cbcd45f463eb70ab1ffbb8ff7f27819.zip
python: bump to 2.7.10
Patches are simply refreshed, except 004-sysconfigdata-install-location.patch where a minor conflict resolution was needed. [Peter: fixup .hash as pointed out by Arnout] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python/101-optional-pydoc.patch')
-rw-r--r--package/python/101-optional-pydoc.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/python/101-optional-pydoc.patch b/package/python/101-optional-pydoc.patch
index d5dc3d72f9..143e11ab92 100644
--- a/package/python/101-optional-pydoc.patch
+++ b/package/python/101-optional-pydoc.patch
@@ -40,7 +40,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2627,6 +2627,11 @@
+@@ -2633,6 +2633,11 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -56,7 +56,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2222,6 +2222,12 @@
+@@ -2211,6 +2211,12 @@
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -69,7 +69,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2242,9 +2248,7 @@
+@@ -2231,9 +2237,7 @@
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
OpenPOWER on IntegriCloud