summaryrefslogtreecommitdiffstats
path: root/package/python3/0023-Add-an-option-to-disable-expat.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-08 00:00:29 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-09 22:35:30 +0100
commit63aeae6538770ab7f4eb048373b2e8d99c26d4c5 (patch)
tree47eb9da38f1747493ba5be0dcbd232314e55af22 /package/python3/0023-Add-an-option-to-disable-expat.patch
parent3c98442669f173818a8cce9479ebb0806cb9f8a2 (diff)
downloadbuildroot-63aeae6538770ab7f4eb048373b2e8d99c26d4c5.tar.gz
buildroot-63aeae6538770ab7f4eb048373b2e8d99c26d4c5.zip
python3: refresh Git formatted patches
This refreshes the set of python3 patches so they apply cleanly on the v3.5.2 tag of cpython Github repository. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python3/0023-Add-an-option-to-disable-expat.patch')
-rw-r--r--package/python3/0023-Add-an-option-to-disable-expat.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/package/python3/0023-Add-an-option-to-disable-expat.patch b/package/python3/0023-Add-an-option-to-disable-expat.patch
index 73f9b36bd0..eff1af8e96 100644
--- a/package/python3/0023-Add-an-option-to-disable-expat.patch
+++ b/package/python3/0023-Add-an-option-to-disable-expat.patch
@@ -1,4 +1,4 @@
-From 6281850ee8c3fb6d93b4997833af0cca4a48947b Mon Sep 17 00:00:00 2001
+From cb39a3171e28ac6db79d3604959730746e50c2b4 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:49:42 +0100
Subject: [PATCH] Add an option to disable expat
@@ -18,10 +18,10 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index b97c21e..bdfee19 100644
+index 90a055c..fcb1ac4 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1180,7 +1180,7 @@ LIBSUBDIRS= \
+@@ -1206,7 +1206,7 @@ LIBSUBDIRS= \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -30,7 +30,7 @@ index b97c21e..bdfee19 100644
importlib \
turtledemo \
multiprocessing multiprocessing/dummy \
-@@ -1257,6 +1257,10 @@ ifeq (@CURSES@,yes)
+@@ -1283,6 +1283,10 @@ ifeq (@CURSES@,yes)
LIBSUBDIRS += curses
endif
@@ -42,10 +42,10 @@ index b97c21e..bdfee19 100644
LIBSUBDIRS += $(TESTSUBDIRS)
endif
diff --git a/configure.ac b/configure.ac
-index 0be47b2..e6bcacc 100644
+index 3814ba0..a7e9d16 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2591,13 +2591,21 @@ PKG_PROG_PKG_CONFIG
+@@ -2673,13 +2673,21 @@ PKG_PROG_PKG_CONFIG
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -73,10 +73,10 @@ index 0be47b2..e6bcacc 100644
# Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi)
diff --git a/setup.py b/setup.py
-index 722308b..ecddb6a 100644
+index be27531..53a471c 100644
--- a/setup.py
+++ b/setup.py
-@@ -1434,7 +1434,7 @@ class PyBuildExt(build_ext):
+@@ -1464,7 +1464,7 @@ class PyBuildExt(build_ext):
#
# More information on Expat can be found at www.libexpat.org.
#
@@ -86,5 +86,5 @@ index 722308b..ecddb6a 100644
define_macros = []
expat_lib = ['expat']
--
-2.6.4
+2.7.4
OpenPOWER on IntegriCloud