Revert "python3: bump to 2.6.4"

[coffee/buildroot.git] / package / python3 / 0015-Add-an-option-to-disable-lib2to3.patch

diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
index 703c066a26769869d889f404527902a5e799a3a4..e6a39383e5a839198bab2caa8d42e08523b7c55d 100644 (file)
--- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
+++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
@@ -10,8 +10,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 [ Andrey Smirnov: ported to Python 3.6 ]
 Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
-[aduskett@gmail.com: Update for python 3.6.4]
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
 ---
  Makefile.pre.in | 16 ++++++++++++----
  configure.ac    |  6 ++++++
@@ -22,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index badb2af35d..931cc3ed07 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1200,7 +1200,9 @@ ifeq (@PYDOC@,yes)
+@@ -1168,7 +1168,9 @@ ifeq (@PYDOC@,yes)
        (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
  endif
        -rm -f $(DESTDIR)$(BINDIR)/2to3
@@ -32,7 +30,7 @@ index badb2af35d..931cc3ed07 100644
        -rm -f $(DESTDIR)$(BINDIR)/pyvenv
        (cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
        if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1237,7 +1239,6 @@ LIBSUBDIRS=      tkinter site-packages \
+@@ -1205,7 +1207,6 @@ LIBSUBDIRS=      tkinter site-packages \
                html json http dbm xmlrpc \
                sqlite3 \
                logging csv wsgiref urllib \
@@ -40,7 +38,7 @@ index badb2af35d..931cc3ed07 100644
                ctypes ctypes/macholib \
                idlelib idlelib/Icons \
                distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1289,9 +1290,6 @@ TESTSUBDIRS=     tkinter/test tkinter/test/test_tkinter \
+@@ -1255,9 +1256,6 @@ TESTSUBDIRS=     tkinter/test tkinter/test/test_tkinter \
                test/test_email test/test_email/data \
                test/test_json \
                sqlite3/test \
@@ -50,7 +48,7 @@ index badb2af35d..931cc3ed07 100644
                ctypes/test \
                idlelib/idle_test \
                distutils/tests \
-@@ -1301,6 +1303,14 @@ TESTSUBDIRS=    tkinter/test tkinter/test/test_tkinter \
+@@ -1267,6 +1265,14 @@ TESTSUBDIRS=    tkinter/test tkinter/test/test_tkinter \
                test/test_tools test/test_warnings test/test_warnings/data \
                unittest/test unittest/test/testmock
  
@@ -65,7 +63,7 @@ index badb2af35d..931cc3ed07 100644
  ifeq (@TEST_MODULES@,yes)
  LIBSUBDIRS += $(TESTSUBDIRS)
  endif
-@@ -1400,10 +1406,12 @@ ifeq (@PYC_BUILD@,yes)
+@@ -1366,10 +1372,12 @@ ifeq (@PYC_BUILD@,yes)
                -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  endif
@@ -99,7 +97,7 @@ diff --git a/setup.py b/setup.py
 index 94dd337fef..76429e1326 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2324,10 +2324,11 @@ def main():
+@@ -2282,10 +2282,11 @@ def main():
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)