sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

python: Add patch for 64bit platform 

This patch was added for 64bit host machines. In the compile process python
is checking if platform is a 64bit platform using sys.maxint which is the host's
value. The patch fixes this issue so that python would check if TARGET machine
is 64bit not the HOST machine. In this way will have "dl" and "imageop" modules
built if HOST machine is 64bit but the target machine is 32bit.

[YOCTO #1937]

(From OE-Core rev: 4993f50744882ee384cb8fb106ad209f0d887b3f)

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andrei Gherzan 2012-04-05 23:54:21 +03:00 committed by Richard Purdie
parent 77a3de5ff0
commit fcb368f767
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch Normal file
View File

@ -0,0 +1,57 @@
Author: Andrei Gherzan <andrei@gherzan.ro>
Date: Sun Mar 25 02:02:27 2012 +0200
This patch was added for 64bit host machines. In the compile process python
is checking if platform is a 64bit platform using sys.maxint which is the host's
value. The patch fixes this issue so that python would check if TARGET machine
is 64bit not the HOST machine. In this way will have "dl" and "imageop" modules
built if HOST machine is 64bit but the target machine is 32bit.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Upstream-Status: Pending
Index: Python-2.7.2/setup.py
===================================================================
--- Python-2.7.2.orig/setup.py 2012-03-25 01:10:41.540163187 +0200
+++ Python-2.7.2/setup.py 2012-03-25 01:26:06.092539990 +0200
@@ -23,6 +23,21 @@
# This global variable is used to hold the list of modules to be disabled.
disabled_module_list = []
+def target_is_64bit_platform ():
+ """
+ In case of cross-compile, some modules are not build as setup checks if HOST
+ is 64bit and not TARGET.
+ As python was built for TARGET we can check this in pyconfig.h in this way:
+ Sizeof LONG on a 32 bit platform is 4 bytes
+ Sizeof LONG on a 64 bit platform is 8 bytes
+ """
+ pyconf = open("pyconfig.h").read()
+ aux = re.search(r"#s*define\s+SIZEOF_LONG\s+8\s*", pyconf)
+ if aux is not None:
+ return True
+ else:
+ return False
+
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
1) 'dir' is not already in 'dirlist'
@@ -628,7 +643,7 @@
exts.append( Extension('audioop', ['audioop.c']) )
# Disabled on 64-bit platforms
- if sys.maxint != 9223372036854775807L:
+ if not target_is_64bit_platform():
# Operations on images
exts.append( Extension('imageop', ['imageop.c']) )
else:
@@ -1418,7 +1433,7 @@
missing.append('_codecs_%s' % loc)
# Dynamic loading module
- if sys.maxint == 0x7fffffff:
+ if not target_is_64bit_platform():
# This requires sizeof(int) == sizeof(long) == sizeof(char*)
dl_inc = find_file('dlfcn.h', [], inc_dirs)
if (dl_inc is not None) and (platform not in ['atheos']):

3
meta/recipes-devtools/python/python_2.7.2.bb
View File

@ -1,6 +1,6 @@
require python.inc
DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
PR = "${INC_PR}.15"
PR = "${INC_PR}.16"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
@ -22,6 +22,7 @@ SRC_URI += "\
file://sys_platform_is_now_always_linux2.patch \
file://fix_for_using_different_libdir.patch \
file://setuptweaks.patch \
file://check-if-target-is-64b-not-host.patch \
"
S = "${WORKDIR}/Python-${PV}"