summaryrefslogtreecommitdiff
path: root/recipes/python
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-04-23 20:28:37 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2009-04-23 20:28:37 +0200
commitf3edd2d29b7e0094db6eaa4c7d9a870a3a7d8796 (patch)
tree7b78ab96fface695033d6514bd3fba772dd7f24a /recipes/python
parent5d82a069f6c51036e79f8b7deeec3e439dae63cc (diff)
parentd9b64f479be887dc1026c747536e1fa76d28f08b (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/python')
-rw-r--r--recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch2
-rw-r--r--recipes/python/python_2.6.1.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch b/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch
index 874b8be01d..58b8078068 100644
--- a/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch
+++ b/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch
@@ -22,7 +22,7 @@ Index: Python-2.6.1/setup.py
res = os.system(cmd)
if res or not os.path.exists(ffi_configfile):
- print "Failed to configure _ctypes module"
-+ print "Failed to configure _ctypes module (ret=%d) or missing conffile=%s" % ( ret, ffi_configfile )
++ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile )
return False
fficonfig = {}
diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb
index 57c64dfa55..e50ca43aab 100644
--- a/recipes/python/python_2.6.1.bb
+++ b/recipes/python/python_2.6.1.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "ml4"
+PR = "ml5"
SRC_URI = "\
http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \