[oe-commits] Roy Li : python3: do not replace ccache in the middle of a path

git at git.openembedded.org git at git.openembedded.org
Tue Nov 4 12:00:59 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: 9f2398a0ff42389052155d971f136a37c5dc80da
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9f2398a0ff42389052155d971f136a37c5dc80da

Author: Roy Li <rongqing.li at windriver.com>
Date:   Wed Oct 22 16:35:43 2014 +0800

python3: 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) ".

Same fix on python 2.xx is:
1181112cf65bc[python: do not replace ccache in the ]

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

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

diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb
index a1cb120..4497e02 100644
--- a/meta/recipes-devtools/python/python3_3.3.3.bb
+++ b/meta/recipes-devtools/python/python3_3.3.3.bb
@@ -84,7 +84,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