From e2c03d54bb11a405255e8a2a0bbb22a7ac80d512 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Feb 2018 07:08:42 +0100 Subject: Revert "python3: bump to 2.6.4" This reverts commit 233202597d9411399aeaded2f9a7cd14f2e29833, which causes a lot of build failures. Part of the Python build process tries to use os.replace(), which is only available since Python 3.3. It should work if the host-python being built was used, but unfortunately the system Python ends up being used, causing the build failure. Fixes: http://autobuild.buildroot.net/results/ed95a7ded6bd6c17bd0820b3a96862487b71eb2b/ Signed-off-by: Thomas Petazzoni --- package/python3/0017-Add-an-option-to-disable-the-tk-module.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'package/python3/0017-Add-an-option-to-disable-the-tk-module.patch') diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index 24f408cbb9..56196416a2 100644 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -7,8 +7,6 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov -[aduskett@gmail.com: Update for python 3.6.4] -Signed-off-by: Adam Duskett --- Makefile.pre.in | 11 ++++++++--- configure.ac | 9 +++++++++ @@ -18,7 +16,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in index a1ce0712cd..dc1e917cc3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1231,7 +1231,7 @@ maninstall: altmaninstall +@@ -1199,7 +1199,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -27,7 +25,7 @@ index a1ce0712cd..dc1e917cc3 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1248,8 +1248,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1216,8 +1216,7 @@ LIBSUBDIRS= tkinter site-packages \ venv venv/scripts venv/scripts/common venv/scripts/posix \ curses @@ -37,7 +35,7 @@ index a1ce0712cd..dc1e917cc3 100644 test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata test/xmltestdata \ -@@ -1297,6 +1296,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1263,6 +1262,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock -- cgit v1.2.3