diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2011-09-18 18:05:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-09-18 21:05:10 +0200 |
| commit | 2455c89bab315c0b6842198f16777585029e364f (patch) | |
| tree | 721daabcba459ded2c463c31a7a118a358c29fc4 /package/python/python-2.7-106-optional-expat.patch | |
| parent | a21642c7eb06eeffe621e7eaef1a85cb9b4589f8 (diff) | |
| download | buildroot-novena-2455c89bab315c0b6842198f16777585029e364f.tar.gz buildroot-novena-2455c89bab315c0b6842198f16777585029e364f.zip | |
python: bump to 2.7.2
This is mostly a mechanical bump, with a refresh of all the patches to
accomodate the offsets, and some minor conflict resolution.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/python/python-2.7-106-optional-expat.patch')
| -rw-r--r-- | package/python/python-2.7-106-optional-expat.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/package/python/python-2.7-106-optional-expat.patch b/package/python/python-2.7-106-optional-expat.patch index 24272d9ab..be1b4a3c6 100644 --- a/package/python/python-2.7-106-optional-expat.patch +++ b/package/python/python-2.7-106-optional-expat.patch @@ -14,20 +14,20 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> setup.py | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) -Index: Python-2.7.1/Makefile.pre.in +Index: Python-2.7.2/Makefile.pre.in =================================================================== ---- Python-2.7.1.orig/Makefile.pre.in -+++ Python-2.7.1/Makefile.pre.in -@@ -857,7 +857,7 @@ - json \ +--- Python-2.7.2.orig/Makefile.pre.in ++++ Python-2.7.2/Makefile.pre.in +@@ -863,7 +863,7 @@ + sqlite3 \ logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib idlelib idlelib/Icons \ -- distutils distutils/command $(XMLLIBSUBDIRS) \ + ctypes ctypes/macholib idlelib idlelib/Icons \ +- distutils distutils/command $(XMLLIBSUBDIRS) \ + distutils distutils/command \ multiprocessing multiprocessing/dummy \ unittest \ lib-old \ -@@ -906,6 +906,10 @@ +@@ -910,6 +910,10 @@ LIBSUBDIRS += curses endif @@ -38,11 +38,11 @@ Index: Python-2.7.1/Makefile.pre.in libinstall: build_all $(srcdir)/Lib/$(PLATDIR) @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ -Index: Python-2.7.1/configure.in +Index: Python-2.7.2/configure.in =================================================================== ---- Python-2.7.1.orig/configure.in -+++ Python-2.7.1/configure.in -@@ -2087,13 +2087,21 @@ +--- Python-2.7.2.orig/configure.in ++++ Python-2.7.2/configure.in +@@ -2102,13 +2102,21 @@ AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -69,11 +69,11 @@ Index: Python-2.7.1/configure.in # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) -Index: Python-2.7.1/setup.py +Index: Python-2.7.2/setup.py =================================================================== ---- Python-2.7.1.orig/setup.py -+++ Python-2.7.1/setup.py -@@ -1383,7 +1383,7 @@ +--- Python-2.7.2.orig/setup.py ++++ Python-2.7.2/setup.py +@@ -1403,7 +1403,7 @@ # # More information on Expat can be found at www.libexpat.org. # |