[oe-commits] Yue Tao : python: do not replace ccache in the middle of a path

git at git.openembedded.org git at git.openembedded.org
Sun Feb 9 11:01:49 UTC 2014


Module: openembedded-core.git
Branch: dora
Commit: 3081a1d16d2e1928f11c221c02d92b2c23fa1d85
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3081a1d16d2e1928f11c221c02d92b2c23fa1d85

Author: Yue Tao <Yue.Tao at windriver.com>
Date:   Thu Nov 28 16:34:48 2013 +0800

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)

Signed-off-by: Lei Liu <lei.liu2 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 meta/recipes-devtools/python/python_2.7.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index 40d20f1..fb7d1c9 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() {
         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



More information about the Openembedded-commits mailing list