summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoxana <roxana.ciobanu@intel.com>2014-06-30 12:44:03 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-30 16:36:44 +0100
commit0ed5a13f5f9478e2c22f517fb3504b738422f85c (patch)
tree49eeac90b5d5b6c6848f32fafd2a268d769c6bca
parent247c9a192cba178e9e9ede050e839d8e504ce7b8 (diff)
downloadpoky-0ed5a13f5f9478e2c22f517fb3504b738422f85c.tar.gz
python3: fix builtins imports
The intent of this code is to generate things like -L=/usr/lib/foo so for paths which start with "/" we should appent the "=". We should not do this for ".". On some recent versions of binutils or patchsets on some recent distros this appears to work differently and causes build failures, for example on Ubuntu 14.04 LTS. The simple fix is to check for "." as the path prefix. [YOCTO #6467]. (From OE-Core rev: c36d459f0d40bdbd3ba809835e0475e8992bc778) Signed-off-by: Roxana <roxana.ciobanu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3/unixccompiler.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python3/unixccompiler.patch b/meta/recipes-devtools/python/python3/unixccompiler.patch
index b2229b4a57..7b90f13883 100644
--- a/meta/recipes-devtools/python/python3/unixccompiler.patch
+++ b/meta/recipes-devtools/python/python3/unixccompiler.patch
@@ -13,11 +13,13 @@ Index: Python-3.3.2/Lib/distutils/unixccompiler.py
13=================================================================== 13===================================================================
14--- Python-3.3.2.orig/Lib/distutils/unixccompiler.py 2013-05-15 09:32:54.000000000 -0700 14--- Python-3.3.2.orig/Lib/distutils/unixccompiler.py 2013-05-15 09:32:54.000000000 -0700
15+++ Python-3.3.2/Lib/distutils/unixccompiler.py 2013-08-01 00:58:18.629056286 -0700 15+++ Python-3.3.2/Lib/distutils/unixccompiler.py 2013-08-01 00:58:18.629056286 -0700
16@@ -202,7 +202,7 @@ 16@@ -202,7 +202,9 @@
17 # ccompiler.py. 17 # ccompiler.py.
18 18
19 def library_dir_option(self, dir): 19 def library_dir_option(self, dir):
20- return "-L" + dir 20- return "-L" + dir
21+ if dir.startswith("."):
22+ return "-L" + dir
21+ return "-L=" + dir 23+ return "-L=" + dir
22 24
23 def _is_gcc(self, compiler_name): 25 def _is_gcc(self, compiler_name):