[oe-commits] Michael 'Mickey' Lauer : python[-native]: fix building ctypes for native version

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 66fb6e3e632673a64542b8c7101be8586ba97827
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=66fb6e3e632673a64542b8c7101be8586ba97827

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed May 13 17:46:41 2009 +0200

python[-native]: fix building ctypes for native version
switch to INC_PR scheme

---

 .../05-enable-ctypes-cross-build.patch             |    5 ++---
 recipes/python/python.inc                          |    2 +-
 recipes/python/python_2.6.2.bb                     |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes/python/python-native-2.6.1/05-enable-ctypes-cross-build.patch b/recipes/python/python-native-2.6.1/05-enable-ctypes-cross-build.patch
index 874b8be..0a70fe2 100644
--- a/recipes/python/python-native-2.6.1/05-enable-ctypes-cross-build.patch
+++ b/recipes/python/python-native-2.6.1/05-enable-ctypes-cross-build.patch
@@ -9,8 +9,7 @@ Index: Python-2.6.1/setup.py
                                           ffi_configfile):
                  from distutils.dir_util import mkpath
                  mkpath(ffi_builddir)
--                config_args = []
-+                config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
++                config_args = [] # '--host=%s' % os.environ["HOST_SYS"], ]
  
                  # Pass empty CFLAGS because we'll just append the resulting
                  # CFLAGS to Python's; -g or -O2 is to be avoided.
@@ -22,7 +21,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.inc b/recipes/python/python.inc
index 390c8c6..598d97c 100644
--- a/recipes/python/python.inc
+++ b/recipes/python/python.inc
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml2.1"
+INC_PR = "ml4"
 
 DEFAULT_PREFERENCE = "-26"
 
diff --git a/recipes/python/python_2.6.2.bb b/recipes/python/python_2.6.2.bb
index 3ecac8f..a540b34 100644
--- a/recipes/python/python_2.6.2.bb
+++ b/recipes/python/python_2.6.2.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 = "ml0"
+PR = "{$INC_PR}.1"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \