diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-06-01 17:55:16 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-06-01 17:55:16 +0200 |
| commit | 577021e81b0bf894d26d8127822410267b2bb411 (patch) | |
| tree | 8b93cd2342bc73294c9a7695cf8d558da7f16503 /package/python3/0023-Add-an-option-to-disable-expat.patch | |
| parent | 206ce569269a4b0b7d3ae60f9162d40b290726d8 (diff) | |
| parent | 5386c61796feb30a02ec287ad769a6754aa525dd (diff) | |
| download | buildroot-577021e81b0bf894d26d8127822410267b2bb411.tar.gz buildroot-577021e81b0bf894d26d8127822410267b2bb411.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.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.patch | 16 |
1 files changed, 8 insertions, 8 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 9cb0799c5d..73f9b36bd0 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 f98b83bca09882d27bb04d7dbcd50f9979ad0569 Mon Sep 17 00:00:00 2001 +From 6281850ee8c3fb6d93b4997833af0cca4a48947b 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 66b2c45..884d5aa 100644 +index b97c21e..bdfee19 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1147,7 +1147,7 @@ LIBSUBDIRS= \ +@@ -1180,7 +1180,7 @@ LIBSUBDIRS= \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -30,7 +30,7 @@ index 66b2c45..884d5aa 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1219,6 +1219,10 @@ ifeq (@CURSES@,yes) +@@ -1257,6 +1257,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -42,10 +42,10 @@ index 66b2c45..884d5aa 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index e48f38e..4bbd597 100644 +index 0be47b2..e6bcacc 100644 --- a/configure.ac +++ b/configure.ac -@@ -2355,13 +2355,21 @@ PKG_PROG_PKG_CONFIG +@@ -2591,13 +2591,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -73,10 +73,10 @@ index e48f38e..4bbd597 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 a2bf05a..fd3ac65 100644 +index 722308b..ecddb6a 100644 --- a/setup.py +++ b/setup.py -@@ -1414,7 +1414,7 @@ class PyBuildExt(build_ext): +@@ -1434,7 +1434,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # |
