diff options
| author | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-02-05 07:08:42 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-02-05 07:08:42 +0100 |
| commit | e2c03d54bb11a405255e8a2a0bbb22a7ac80d512 (patch) | |
| tree | c7cb8a044450b565f4988af164f31986007c6ff3 /package/python3/0014-Add-an-option-to-disable-pydoc.patch | |
| parent | 9385bc05208397feefb68518b31d560b2d6dee6c (diff) | |
| download | buildroot-e2c03d54bb11a405255e8a2a0bbb22a7ac80d512.tar.gz buildroot-e2c03d54bb11a405255e8a2a0bbb22a7ac80d512.zip | |
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 <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python3/0014-Add-an-option-to-disable-pydoc.patch')
| -rw-r--r-- | package/python3/0014-Add-an-option-to-disable-pydoc.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch index 36d4cf2172..fc565cfe10 100644 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0014-Add-an-option-to-disable-pydoc.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 | 8 +++++++- configure.ac | 6 ++++++ @@ -22,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in index 4110fff4ac..badb2af35d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1196,7 +1196,9 @@ bininstall: altbininstall +@@ -1164,7 +1164,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -32,7 +30,7 @@ index 4110fff4ac..badb2af35d 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) -rm -f $(DESTDIR)$(BINDIR)/pyvenv -@@ -1244,7 +1246,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1212,7 +1214,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -41,7 +39,7 @@ index 4110fff4ac..badb2af35d 100644 TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk test \ -@@ -1303,6 +1305,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1269,6 +1271,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -73,7 +71,7 @@ diff --git a/setup.py b/setup.py index 29bfd174d2..94dd337fef 100644 --- a/setup.py +++ b/setup.py -@@ -2323,6 +2323,12 @@ def main(): +@@ -2281,6 +2281,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -86,7 +84,7 @@ index 29bfd174d2..94dd337fef 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2347,8 +2353,7 @@ def main(): +@@ -2305,8 +2311,7 @@ def main(): # 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 |
