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-110-optional-db.patch | |
| parent | a21642c7eb06eeffe621e7eaef1a85cb9b4589f8 (diff) | |
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-110-optional-db.patch')
| -rw-r--r-- | package/python/python-2.7-110-optional-db.patch | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/package/python/python-2.7-110-optional-db.patch b/package/python/python-2.7-110-optional-db.patch index 5589ed3c6..0d5ee0c26 100644 --- a/package/python/python-2.7-110-optional-db.patch +++ b/package/python/python-2.7-110-optional-db.patch @@ -11,28 +11,29 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> configure.in | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 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 -@@ -855,7 +855,7 @@ - encodings compiler hotshot \ +--- Python-2.7.2.orig/Makefile.pre.in ++++ Python-2.7.2/Makefile.pre.in +@@ -861,7 +861,7 @@ email email/mime \ json \ + sqlite3 \ - logging bsddb csv importlib wsgiref \ + logging csv importlib wsgiref \ - ctypes ctypes/macholib idlelib idlelib/Icons \ + ctypes ctypes/macholib idlelib idlelib/Icons \ distutils distutils/command \ multiprocessing multiprocessing/dummy \ -@@ -868,7 +868,6 @@ - test/decimaltestdata test/xmltestdata \ - test/tracedmodules \ - email/test email/test/data \ -- bsddb/test \ - ctypes/test distutils/tests \ - unittest/test +@@ -873,7 +873,7 @@ + LIBSUBDIRS += test test/data \ + test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \ + test/tracedmodules email/test email/test/data \ +- json/tests sqlite3/test bsddb/test \ ++ json/tests sqlite3/test \ + ctypes/test distutils/tests unittest/test endif -@@ -910,6 +909,13 @@ + +@@ -914,6 +914,13 @@ LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -46,11 +47,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 -@@ -2421,6 +2421,28 @@ +--- Python-2.7.2.orig/configure.in ++++ Python-2.7.2/configure.in +@@ -2436,6 +2436,28 @@ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) |