diff options
author | Jingdong Lu <jingdong.lu@windriver.com> | 2011-01-19 17:04:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-20 21:37:02 +0000 |
commit | e261c1760d8a660c13cd00039a4812d51f47f3df (patch) | |
tree | a4d4e071a2b465cd08bdbdc1cfc3e8a5b47e6f85 /meta | |
parent | 426de6589b4b94769446e655999b68d0ab1f046b (diff) | |
download | poky-e261c1760d8a660c13cd00039a4812d51f47f3df.tar.gz |
python: Fix failures of LSB python-runtime tests.
Fix failues of LSB python-runtime tests.
test_largefile: add "ac_cv_sizeof_off_t=8" option explicitly into configure options in order to enable "LFS".
test_codecs, test_re, test_unicode: "--with-wctype-functions" will cause these tests failed, so remove it for LSB.
test_builtin, test_getargs: "sitecustomize.py" cause default encoding changed from "ascii" into "utf8" and it will cause these tests failed, so remove this file for LSB.
Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python.inc | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.6.6.bb | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 62a6ba1589..f78250769b 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc | |||
@@ -22,4 +22,14 @@ EXTRA_OECONF = "\ | |||
22 | --enable-shared \ | 22 | --enable-shared \ |
23 | " | 23 | " |
24 | 24 | ||
25 | EXTRA_OECONF_poky-lsb = "\ | ||
26 | --with-threads \ | ||
27 | --with-pymalloc \ | ||
28 | --with-cyclic-gc \ | ||
29 | --without-cxx \ | ||
30 | --with-signal-module \ | ||
31 | --enable-shared \ | ||
32 | ac_cv_sizeof_off_t=8 \ | ||
33 | " | ||
34 | |||
25 | PARALLEL_MAKE = "" | 35 | PARALLEL_MAKE = "" |
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb index b33e0a9e87..ad0d7a956a 100644 --- a/meta/recipes-devtools/python/python_2.6.6.bb +++ b/meta/recipes-devtools/python/python_2.6.6.bb | |||
@@ -1,8 +1,11 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" |
3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" | 3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" |
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.1" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" |
6 | |||
7 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | ||
8 | DISTRO_SRC_URI_poky-lsb = "" | ||
6 | SRC_URI = "\ | 9 | SRC_URI = "\ |
7 | http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ | 10 | http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ |
8 | file://01-use-proper-tools-for-cross-build.patch \ | 11 | file://01-use-proper-tools-for-cross-build.patch \ |
@@ -12,7 +15,7 @@ SRC_URI = "\ | |||
12 | file://05-enable-ctypes-cross-build.patch \ | 15 | file://05-enable-ctypes-cross-build.patch \ |
13 | file://06-avoid_usr_lib_termcap_path_in_linking.patch \ | 16 | file://06-avoid_usr_lib_termcap_path_in_linking.patch \ |
14 | file://99-ignore-optimization-flag.patch \ | 17 | file://99-ignore-optimization-flag.patch \ |
15 | file://sitecustomize.py \ | 18 | ${DISTRO_SRC_URI} \ |
16 | " | 19 | " |
17 | 20 | ||
18 | SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" | 21 | SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" |
@@ -74,7 +77,9 @@ do_install() { | |||
74 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | 77 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ |
75 | DESTDIR=${D} LIBDIR=${libdir} install | 78 | DESTDIR=${D} LIBDIR=${libdir} install |
76 | 79 | ||
77 | install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} | 80 | if [ -e ${WORKDIR}/sitecustomize.py ]; then |
81 | install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} | ||
82 | fi | ||
78 | 83 | ||
79 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 | 84 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 |
80 | sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile | 85 | sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile |