From 8fbef33bfac1a820ee48cbe296b56dfb06d1f0b8 Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Sat, 17 Aug 2019 21:00:51 +0200 Subject: libcxx: Add libunwind to PROVIDES not only RPROVIDES. Without this bitbake will still pull standard libunwind package when building recipes depending on libunwind. If such recipe also happens to pull libcxx the build will fail when assembling the sysroot because both libcxx and libunwind provide libunwind.so. This problem has been observed when building libstd-rs from meta-rust layer agains musl libc. Signed-off-by: Piotr Tworek --- recipes-devtools/clang/libcxx_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index dafeccc..7bbe847 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -80,7 +80,7 @@ do_install() { ALLOW_EMPTY_${PN} = "1" -#PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" +PROVIDES = "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" RPROVIDES_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" RPROVIDES_${PN}-dev += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind-dev', '', d)}" RPROVIDES_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind-doc', '', d)}" -- cgit v1.2.3-54-g00ecf