Patchwork python: do not replace ccache in the middle of a path

login
register
mail settings
Submitter Yue Tao
Date Nov. 28, 2013, 8:34 a.m.
Message ID <1385627688-19959-1-git-send-email-Yue.Tao@windriver.com>
Download mbox | patch
Permalink /patch/62525/
State New
Headers show

Comments

Yue Tao - Nov. 28, 2013, 8:34 a.m.
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) ".

Signed-off-by: Lei Liu <lei.liu2@windriver.com>
---
 meta/recipes-devtools/python/python_2.7.3.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index 887e02e..b560b82 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