summaryrefslogtreecommitdiffstats
path: root/package/python/102-optional-2to3.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/102-optional-2to3.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/102-optional-2to3.patch')
-rw-r--r--package/python/102-optional-2to3.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/python/102-optional-2to3.patch b/package/python/102-optional-2to3.patch
index 76edfa102f..100c417a21 100644
--- a/package/python/102-optional-2to3.patch
+++ b/package/python/102-optional-2to3.patch
@@ -52,7 +52,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2639,6 +2639,12 @@
+@@ -2645,6 +2645,12 @@
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@@ -69,7 +69,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2223,10 +2223,11 @@
+@@ -2212,10 +2212,11 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
OpenPOWER on IntegriCloud