diff options
author | Yue Tao <Yue.Tao@windriver.com> | 2013-11-28 16:34:48 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-09 11:04:13 +0000 |
commit | 2ab41dfb60a6c82bd99112ec616ed98f2a91d70c (patch) | |
tree | 76b25e6d88d30504d4d46775211def2405df5e00 /meta/recipes-devtools | |
parent | fdad6bae43b8f5e13390e1548db312aaf233ba5d (diff) | |
download | poky-2ab41dfb60a6c82bd99112ec616ed98f2a91d70c.tar.gz |
python: do not replace ccache in the middle of a path
Python recipe did a sed s/ccache/$(CCACHE) on the Makefile, which
replaces all "ccache" including ones that consist of a full path.
This leads to build error when building in a project path with
"ccache" in its name. Fix it by only replacing "ccache " with
"$(CCACHE) ".
(From OE-Core master rev: 1181112cf65bc0186807fc59399c5dddcb9f9449)
(From OE-Core rev: 3081a1d16d2e1928f11c221c02d92b2c23fa1d85)
Signed-off-by: Lei Liu <lei.liu2@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.3.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index 40d20f1f4f..fb7d1c9355 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb | |||
@@ -61,7 +61,7 @@ do_compile() { | |||
61 | cd - | 61 | cd - |
62 | 62 | ||
63 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 | 63 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 |
64 | sed -i -e s,ccache,'$(CCACHE)', Makefile | 64 | sed -i -e s,ccache\ ,'$(CCACHE) ', Makefile |
65 | 65 | ||
66 | # remove any bogus LD_LIBRARY_PATH | 66 | # remove any bogus LD_LIBRARY_PATH |
67 | sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile | 67 | sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile |