From 461df79fbb655e4c6894d9a9e9ce52656b96303d Mon Sep 17 00:00:00 2001 From: Mei Lei Date: Thu, 28 Jul 2011 15:20:36 +0800 Subject: python-native: Fix a compiler finding issue The CC variable sometimes add option information after compiler name, but python can't get the real compiler name if those information added. Fix this issue by dropping the option information when finding compiler name. Signed-off-by: Mei Lei --- .../python/python-native/unixccompiler.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/python/python-native_2.6.6.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/python/python-native/unixccompiler.patch diff --git a/meta/recipes-devtools/python/python-native/unixccompiler.patch b/meta/recipes-devtools/python/python-native/unixccompiler.patch new file mode 100644 index 000000000..10a9baf46 --- /dev/null +++ b/meta/recipes-devtools/python/python-native/unixccompiler.patch @@ -0,0 +1,20 @@ +Upstream-Status: Inappropriate [embedded specific] + +# The CC variable,sometimes like:"x86_64-poky-linux-gcc -m64 --sysroot=/${TMPDIR}/sysroots/qemux86-64", contains option information. +# This will lead to wrong compiler name "qemux86-64" rather than "x86_64-poky-linux-gcc" when python finding the compiler name. + +#Signed-off-by: Mei Lei + +diff --git Python-2.6.6/Lib/distutils/unixccompiler.py Python-2.6.6/Lib/distutils/unixccompiler.py +index 6d0b84d..aaf49cb 100644 +--- Python-2.6.6/Lib/distutils/unixccompiler.py ++++ Python-2.6.6/Lib/distutils/unixccompiler.py +@@ -282,7 +282,7 @@ class UnixCCompiler(CCompiler): + # this time, there's no way to determine this information from + # the configuration data stored in the Python installation, so + # we use this hack. +- compiler = os.path.basename(sysconfig.get_config_var("CC")) ++ compiler = os.path.basename(sysconfig.get_config_var("CC").split()[0]) + if sys.platform[:6] == "darwin": + # MacOSX's linker doesn't understand the -R flag at all + return "-L" + dir diff --git a/meta/recipes-devtools/python/python-native_2.6.6.bb b/meta/recipes-devtools/python/python-native_2.6.6.bb index 59ed61a67..2b00d3236 100644 --- a/meta/recipes-devtools/python/python-native_2.6.6.bb +++ b/meta/recipes-devtools/python/python-native_2.6.6.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" @@ -12,6 +12,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://11-distutils-never-modify-shebang-line.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://debug.patch \ + file://unixccompiler.patch \ file://nohostlibs.patch" S = "${WORKDIR}/Python-${PV}" -- cgit v1.2.3