summaryrefslogtreecommitdiffstats
path: root/package/python3/0019-Add-an-option-to-disable-expat.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-02-05 07:08:42 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-02-05 07:08:42 +0100
commite2c03d54bb11a405255e8a2a0bbb22a7ac80d512 (patch)
treec7cb8a044450b565f4988af164f31986007c6ff3 /package/python3/0019-Add-an-option-to-disable-expat.patch
parent9385bc05208397feefb68518b31d560b2d6dee6c (diff)
downloadbuildroot-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/0019-Add-an-option-to-disable-expat.patch')
-rw-r--r--package/python3/0019-Add-an-option-to-disable-expat.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch
index 6361c1f450..0ec0b21555 100644
--- a/package/python3/0019-Add-an-option-to-disable-expat.patch
+++ b/package/python3/0019-Add-an-option-to-disable-expat.patch
@@ -13,8 +13,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 | 6 +++++-
configure.ac | 18 +++++++++++++-----
@@ -25,7 +23,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
index 6a6bc082cd..dc4b92b6fe 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1240,7 +1240,7 @@ LIBSUBDIRS= site-packages \
+@@ -1208,7 +1208,7 @@ LIBSUBDIRS= site-packages \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -34,7 +32,7 @@ index 6a6bc082cd..dc4b92b6fe 100644
importlib \
turtledemo \
multiprocessing multiprocessing/dummy \
-@@ -1305,6 +1305,10 @@ ifeq (@CURSES@,yes)
+@@ -1271,6 +1271,10 @@ ifeq (@CURSES@,yes)
LIBSUBDIRS += curses
endif
@@ -80,7 +78,7 @@ diff --git a/setup.py b/setup.py
index 76429e1326..38aa5e605e 100644
--- a/setup.py
+++ b/setup.py
-@@ -1525,7 +1525,7 @@ class PyBuildExt(build_ext):
+@@ -1495,7 +1495,7 @@ class PyBuildExt(build_ext):
#
# More information on Expat can be found at www.libexpat.org.
#
@@ -88,7 +86,7 @@ index 76429e1326..38aa5e605e 100644
+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
expat_inc = []
define_macros = []
- extra_compile_args = []
+ expat_lib = ['expat']
--
2.13.5
OpenPOWER on IntegriCloud