diff options
author | aprospero <apro@posteo.de> | 2025-03-17 14:12:53 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-03-17 18:38:45 -0700 |
commit | b9ef02282197380ef05edbd0eb852e1934ceb59b (patch) | |
tree | bcdca9b3ca09fc57f4c441b604da36d1c60f1543 | |
parent | 8c77b427408db01b8de4c04bd3d247c13c154f92 (diff) | |
download | meta-clang-b9ef02282197380ef05edbd0eb852e1934ceb59b.tar.gz |
fix: [Issue #1061] - check for existence before trying to process a file
In certain configurations LLVMConfig.cmake does not exist. If that's the case do_install breaks for the nativesdk-clang recipe.
Eg. set the following:
EXTRA_OECMAKE:append:pn-nativesdk-clang = " -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON"
as suggested here:
https://llvm.org/docs/BuildingADistribution.html
Signed-off-by: aprospero <apro@posteo.de>
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index f863c84..cdf832a 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb | |||
@@ -276,7 +276,9 @@ do_install:append:class-native () { | |||
276 | } | 276 | } |
277 | 277 | ||
278 | do_install:append:class-nativesdk () { | 278 | do_install:append:class-nativesdk () { |
279 | sed -i -e "s|${B}/./bin/||g" ${D}${libdir}/cmake/llvm/LLVMConfig.cmake | 279 | if [ -e ${D}${libdir}/cmake/llvm/LLVMConfig.cmake ] ; then |
280 | sed -i -e "s|${B}/./bin/||g" ${D}${libdir}/cmake/llvm/LLVMConfig.cmake | ||
281 | fi | ||
280 | if ${@bb.utils.contains('PACKAGECONFIG', 'clangd', 'true', 'false', d)}; then | 282 | if ${@bb.utils.contains('PACKAGECONFIG', 'clangd', 'true', 'false', d)}; then |
281 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clangd-indexer ${D}${bindir}/clangd-indexer | 283 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clangd-indexer ${D}${bindir}/clangd-indexer |
282 | fi | 284 | fi |
@@ -293,7 +295,9 @@ do_install:append:class-nativesdk () { | |||
293 | rm -rf ${D}${datadir}/llvm | 295 | rm -rf ${D}${datadir}/llvm |
294 | 296 | ||
295 | #reproducibility | 297 | #reproducibility |
296 | sed -i -e 's,${B},,g' ${D}${libdir}/cmake/llvm/LLVMConfig.cmake | 298 | if [ -e ${D}${libdir}/cmake/llvm/LLVMConfig.cmake ] ; then |
299 | sed -i -e 's,${B},,g' ${D}${libdir}/cmake/llvm/LLVMConfig.cmake | ||
300 | fi | ||
297 | } | 301 | } |
298 | 302 | ||
299 | PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python ${PN}-libclang-cpp ${PN}-tidy ${PN}-format ${PN}-tools \ | 303 | PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python ${PN}-libclang-cpp ${PN}-tidy ${PN}-format ${PN}-tools \ |