diff options
author | Kai Kang <kai.kang@windriver.com> | 2021-04-23 11:29:03 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-04 22:57:51 +0100 |
commit | 509dd69bad77320e6e910c8e6dc4091d5c482f6a (patch) | |
tree | 762f08ddcd9ec23997460765fcbcbca279f0d556 /meta | |
parent | 81a90094bb30c52f8a624c0513768b9f25c36a66 (diff) | |
download | poky-509dd69bad77320e6e910c8e6dc4091d5c482f6a.tar.gz |
cmake.bbclass: remove ${B} before cmake_do_configure
It is fallible to remove ${B} in directory ${B} itself. And it does fail
when call bitbake by third-party wrapper script.
Use flag 'cleandirs' to remove ${B} first if build out of source tree.
(From OE-Core rev: db6a315e5f6de02e226e582f878a83c427fd87cc)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0fb6280432a36985590d9a714a5f11164aaebb51)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/cmake.bbclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 8876ce5aa5..f01db7480b 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass | |||
@@ -149,16 +149,14 @@ addtask generate_toolchain_file after do_patch before do_configure | |||
149 | 149 | ||
150 | CONFIGURE_FILES = "CMakeLists.txt" | 150 | CONFIGURE_FILES = "CMakeLists.txt" |
151 | 151 | ||
152 | do_configure[cleandirs] = "${@d.getVar('B') if d.getVar('S') != d.getVar('B') else ''}" | ||
153 | |||
152 | cmake_do_configure() { | 154 | cmake_do_configure() { |
153 | if [ "${OECMAKE_BUILDPATH}" ]; then | 155 | if [ "${OECMAKE_BUILDPATH}" ]; then |
154 | bbnote "cmake.bbclass no longer uses OECMAKE_BUILDPATH. The default behaviour is now out-of-tree builds with B=WORKDIR/build." | 156 | bbnote "cmake.bbclass no longer uses OECMAKE_BUILDPATH. The default behaviour is now out-of-tree builds with B=WORKDIR/build." |
155 | fi | 157 | fi |
156 | 158 | ||
157 | if [ "${S}" != "${B}" ]; then | 159 | if [ "${S}" = "${B}" ]; then |
158 | rm -rf ${B} | ||
159 | mkdir -p ${B} | ||
160 | cd ${B} | ||
161 | else | ||
162 | find ${B} -name CMakeFiles -or -name Makefile -or -name cmake_install.cmake -or -name CMakeCache.txt -delete | 160 | find ${B} -name CMakeFiles -or -name Makefile -or -name cmake_install.cmake -or -name CMakeCache.txt -delete |
163 | fi | 161 | fi |
164 | 162 | ||