diff options
author | Ulf Samuelsson <ulf_samuelsson@telia.com> | 2011-10-22 14:46:33 +0200 |
---|---|---|
committer | Ulf Samuelsson <ulf_samuelsson@telia.com> | 2011-11-21 15:54:21 +0100 |
commit | 5997570120636720714f258c2b3ee003967d0c75 (patch) | |
tree | ac077782f5dffa7fbe277df30d71a77d68ee5302 | |
parent | fd3fdd5980c623d330f021a72952e8477d42516a (diff) | |
download | openembedded-5997570120636720714f258c2b3ee003967d0c75.tar.gz |
python-2.6.6: Fix python-2.6.6 build failure on linux-3.x
python-2.6.6 build will crash when host is running linux kernel 3.x.
Fix backported from openembedded-core.
meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
Signed-Off-By: Ulf Samuelsson <ulf_samuelsson@telia.com>
-rw-r--r-- | recipes/python/python-2.6.6/07-linux3-regen-fix.patch | 18 | ||||
-rw-r--r-- | recipes/python/python_2.6.6.bb | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/recipes/python/python-2.6.6/07-linux3-regen-fix.patch b/recipes/python/python-2.6.6/07-linux3-regen-fix.patch new file mode 100644 index 0000000000..a059605746 --- /dev/null +++ b/recipes/python/python-2.6.6/07-linux3-regen-fix.patch @@ -0,0 +1,18 @@ +Upstream-Status: Inappropriate [embedded specific] + +Without this patch it calls cross-compiled python if host is running linux-3.0 +python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h +| ./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 + +diff -uNr Python-2.6.6.orig//Lib/plat-linux3/regen Python-2.6.6/Lib/plat-linux3/regen +--- Python-2.6.6.orig//Lib/plat-linux3/regen 1970-01-01 01:00:00.000000000 +0100 ++++ Python-2.6.6/Lib/plat-linux3/regen 2001-08-09 14:48:17.000000000 +0200 +@@ -0,0 +1,8 @@ ++#! /bin/sh ++case `uname` in ++Linux*) ;; ++*) echo Probably not on a Linux system 1>&2 ++ exit 1;; ++esac ++set -v ++h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h diff --git a/recipes/python/python_2.6.6.bb b/recipes/python/python_2.6.6.bb index eacc5c2b96..5b47fecec4 100644 --- a/recipes/python/python_2.6.6.bb +++ b/recipes/python/python_2.6.6.bb @@ -3,7 +3,7 @@ DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl zlib\ ${@base_contains('DISTRO_FEATURES', 'tk', 'tk', '', d)}" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" # set to .0 on every increase of INC_PR -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ @@ -14,6 +14,7 @@ SRC_URI = "\ file://04-default-is-optimized.patch \ file://05-enable-ctypes-cross-build.patch \ file://06-ctypes-libffi-fix-configure.patch \ + file://07-linux3-regen-fix.patch \ file://ipv6-cross.patch \ file://python-module-rpath-fix.patch \ file://sitecustomize.py \ |