summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-07-28 15:20:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-08 13:41:19 +0100
commit74f64be449a50f31a5609637a72ecaa8480b28a9 (patch)
tree36a6b0b377dedc0b8d01d6e6a0392d4f07570835 /meta/recipes-devtools
parent2ac54c45196ae1409f60f0cc314208a0c422660b (diff)
downloadpoky-74f64be449a50f31a5609637a72ecaa8480b28a9.tar.gz
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. (From OE-Core rev: 461df79fbb655e4c6894d9a9e9ce52656b96303d) Signed-off-by: Mei Lei <lei.mei@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python-native/unixccompiler.patch20
-rw-r--r--meta/recipes-devtools/python/python-native_2.6.6.bb3
2 files changed, 22 insertions, 1 deletions
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 0000000000..10a9baf46b
--- /dev/null
+++ b/meta/recipes-devtools/python/python-native/unixccompiler.patch
@@ -0,0 +1,20 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3# The CC variable,sometimes like:"x86_64-poky-linux-gcc -m64 --sysroot=/${TMPDIR}/sysroots/qemux86-64", contains option information.
4# This will lead to wrong compiler name "qemux86-64" rather than "x86_64-poky-linux-gcc" when python finding the compiler name.
5
6#Signed-off-by: Mei Lei <lei.mei@intel.com>
7
8diff --git Python-2.6.6/Lib/distutils/unixccompiler.py Python-2.6.6/Lib/distutils/unixccompiler.py
9index 6d0b84d..aaf49cb 100644
10--- Python-2.6.6/Lib/distutils/unixccompiler.py
11+++ Python-2.6.6/Lib/distutils/unixccompiler.py
12@@ -282,7 +282,7 @@ class UnixCCompiler(CCompiler):
13 # this time, there's no way to determine this information from
14 # the configuration data stored in the Python installation, so
15 # we use this hack.
16- compiler = os.path.basename(sysconfig.get_config_var("CC"))
17+ compiler = os.path.basename(sysconfig.get_config_var("CC").split()[0])
18 if sys.platform[:6] == "darwin":
19 # MacOSX's linker doesn't understand the -R flag at all
20 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 59ed61a67a..2b00d32364 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 @@
1require python.inc 1require python.inc
2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" 2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
3PR = "${INC_PR}.2" 3PR = "${INC_PR}.3"
4 4
5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
6 6
@@ -12,6 +12,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
12 file://11-distutils-never-modify-shebang-line.patch \ 12 file://11-distutils-never-modify-shebang-line.patch \
13 file://12-distutils-prefix-is-inside-staging-area.patch \ 13 file://12-distutils-prefix-is-inside-staging-area.patch \
14 file://debug.patch \ 14 file://debug.patch \
15 file://unixccompiler.patch \
15 file://nohostlibs.patch" 16 file://nohostlibs.patch"
16S = "${WORKDIR}/Python-${PV}" 17S = "${WORKDIR}/Python-${PV}"
17 18