diff options
| author | Roy Li <rongqing.li@windriver.com> | 2014-10-22 16:35:43 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:18:27 +0000 |
| commit | c8279678d4030951829cfc6996b2d49874cdc1a5 (patch) | |
| tree | 927838607f4f2de5f330098445a8242a8018806d | |
| parent | 21b15bc6cdda1c260b8206574ed77a639f29e849 (diff) | |
| download | poky-c8279678d4030951829cfc6996b2d49874cdc1a5.tar.gz | |
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 ]
(From OE-Core rev: 9f2398a0ff42389052155d971f136a37c5dc80da)
(From OE-Core rev: 7e4e2301d95f897e2f91b1c37b56dbd190841acb)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.3.3.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb index a1cb12078f..4497e02586 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() { | |||
| 84 | cd - | 84 | cd - |
| 85 | 85 | ||
| 86 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 | 86 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 |
| 87 | sed -i -e s,ccache,'$(CCACHE)', Makefile | 87 | sed -i -e s,ccache\ ,'$(CCACHE) ', Makefile |
| 88 | 88 | ||
| 89 | # remove any bogus LD_LIBRARY_PATH | 89 | # remove any bogus LD_LIBRARY_PATH |
| 90 | sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile | 90 | sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile |
