]> code.ossystems Code Review - openembedded-core.git/commitdiff
python: do not replace ccache in the middle of a path
authorYue Tao <Yue.Tao@windriver.com>
Thu, 28 Nov 2013 08:34:48 +0000 (16:34 +0800)
committerRobert Yang <liezhi.yang@windriver.com>
Sun, 26 Jan 2014 06:08:14 +0000 (14:08 +0800)
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)

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>
meta/recipes-devtools/python/python_2.7.3.bb

index 40d20f1f4fdfe1f8731f2368df96da94c47ef876..fb7d1c9355a205c801224567e31cb0dea3471ede 100644 (file)
@@ -61,7 +61,7 @@ do_compile() {
         cd -
 
        # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144
-       sed -i -e s,ccache,'$(CCACHE)', Makefile
+       sed -i -e s,ccache\ ,'$(CCACHE) ', Makefile
 
        # remove any bogus LD_LIBRARY_PATH
        sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile