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>
This commit is contained in:
Thomas Petazzoni
2011-09-18 18:05:23 +02:00
committed by Peter Korsgaard
parent a21642c7eb
commit 2455c89bab
30 changed files with 279 additions and 286 deletions

View File

@@ -1,20 +1,22 @@
diff -r 683202530137 configure
--- a/configure Fri Aug 12 11:40:39 2011 +0300
+++ b/configure Fri Aug 12 14:02:18 2011 +0200
@@ -3055,6 +3055,7 @@ then
cygwin*) MACHDEP="cygwin";;
Index: Python-2.7.2/configure
===================================================================
--- Python-2.7.2.orig/configure
+++ Python-2.7.2/configure
@@ -3007,6 +3007,7 @@
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
irix646) MACHDEP="irix6";;
+ linux*) MACHDEP="linux2";;
'') MACHDEP="unknown";;
esac
fi
diff -r 683202530137 configure.in
--- a/configure.in Fri Aug 12 11:40:39 2011 +0300
+++ b/configure.in Fri Aug 12 14:02:18 2011 +0200
@@ -307,6 +307,7 @@ then
cygwin*) MACHDEP="cygwin";;
Index: Python-2.7.2/configure.in
===================================================================
--- Python-2.7.2.orig/configure.in
+++ Python-2.7.2/configure.in
@@ -297,6 +297,7 @@
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
irix646) MACHDEP="irix6";;
+ linux*) MACHDEP="linux2";;
'') MACHDEP="unknown";;