From: Koen Kooi <koen@openembedded.org>
Date: Wed, 15 Apr 2009 12:00:18 +0000 (+0200)
Subject: python 2.6.1: fix build for architectures lacking libffi support
X-Git-Tag: Release-2010-05/1~3782^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=883da3d9544c4340cd83cfe688b7551bbaf43ba4;p=openembedded.git

python 2.6.1: fix build for architectures lacking libffi support
* if your patch does: +res = os.system(cmd) ; print "ret %d" % res, DO NOT change the second 'res' to 'ret'!
* this fixes a regression since python 2.5.x
---

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 \