diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-07-20 21:52:15 +0200 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2011-10-14 09:38:40 -0700 |
commit | 5eabb172025849dfa32563a8076b0f639978c338 (patch) | |
tree | d960f5d97788277a5c81cc6da2c3085efc03a5d6 /meta | |
parent | b3cb28df9f83f024a9fb43e46574745a76ac09cf (diff) | |
download | poky-5eabb172025849dfa32563a8076b0f639978c338.tar.gz |
python: add patch to fix cross compilation on host with linux-3.0
(From OE-Core rev: 4b7e7b004dacb698ed637f35661a60d2402c00cd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python/07-linux3-regen-fix.patch | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.6.6.bb | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch b/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch new file mode 100644 index 0000000000..d7fb313cc7 --- /dev/null +++ b/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Without this patch it calls cross-compiled python if host is running linux-3.0 | ||
4 | python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h | ||
5 | | ./regen: line 3: /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.6.6-nk2.8/Python-2.6.6/python: cannot execute binary file | ||
6 | |||
7 | diff -uNr Python-2.6.6.orig//Lib/plat-linux3/regen Python-2.6.6/Lib/plat-linux3/regen | ||
8 | --- Python-2.6.6.orig//Lib/plat-linux3/regen 1970-01-01 01:00:00.000000000 +0100 | ||
9 | +++ Python-2.6.6/Lib/plat-linux3/regen 2001-08-09 14:48:17.000000000 +0200 | ||
10 | @@ -0,0 +1,8 @@ | ||
11 | +#! /bin/sh | ||
12 | +case `uname` in | ||
13 | +Linux*) ;; | ||
14 | +*) echo Probably not on a Linux system 1>&2 | ||
15 | + exit 1;; | ||
16 | +esac | ||
17 | +set -v | ||
18 | +h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h | ||
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb index 6553c8fdc4..b0438fe164 100644 --- a/meta/recipes-devtools/python/python_2.6.6.bb +++ b/meta/recipes-devtools/python/python_2.6.6.bb | |||
@@ -15,6 +15,7 @@ SRC_URI = "\ | |||
15 | file://05-enable-ctypes-cross-build.patch \ | 15 | file://05-enable-ctypes-cross-build.patch \ |
16 | file://06-ctypes-libffi-fix-configure.patch \ | 16 | file://06-ctypes-libffi-fix-configure.patch \ |
17 | file://06-avoid_usr_lib_termcap_path_in_linking.patch \ | 17 | file://06-avoid_usr_lib_termcap_path_in_linking.patch \ |
18 | file://07-linux3-regen-fix.patch \ | ||
18 | file://99-ignore-optimization-flag.patch \ | 19 | file://99-ignore-optimization-flag.patch \ |
19 | ${DISTRO_SRC_URI} \ | 20 | ${DISTRO_SRC_URI} \ |
20 | " | 21 | " |