clang: Merge libunwind back into libcxx

Do not export libunwind to other recipes besides libcxx itself, we use
non-gnu libunwind on linux in general and its not a drop in replacement
as of yet

Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 425ecda..2d530c5 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -15,7 +15,7 @@ PACKAGECONFIG_riscv32 = "exceptions"
 PACKAGECONFIG_riscv64 = "exceptions"
 PACKAGECONFIG_append_armv5 = " no-atomics"
 
-PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,llvm-libunwind"
+PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=ON -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,,"
 PACKAGECONFIG[exceptions] = "-DLIBCXXABI_ENABLE_EXCEPTIONS=ON -DDLIBCXX_ENABLE_EXCEPTIONS=ON,-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF -DLIBCXX_ENABLE_EXCEPTIONS=OFF -DCMAKE_REQUIRED_FLAGS='-fno-exceptions',"
 PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED_LINKER_FLAGS='-latomic',,"
 PACKAGECONFIG[compiler-rt] = "-DLIBCXXABI_USE_COMPILER_RT=ON -DLIBCXX_USE_COMPILER_RT=ON,-DLIBCXXABI_USE_COMPILER_RT=OFF -DLIBCXX_USE_COMPILER_RT=OFF,compiler-rt"
@@ -29,11 +29,16 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
                     file://libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
+                    file://libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
 "
 
 EXTRA_OECMAKE += "\
                   -DCMAKE_CROSSCOMPILING=ON \
                   -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
+                  -DLIBUNWIND_ENABLE_SHARED=OFF \
+                  -DLIBUNWIND_ENABLE_THREADS=OFF \
+                  -DLIBUNWIND_WEAK_PTHREAD_LIB=ON \
+                  -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON \
                   -DLIBCXXABI_INCLUDE_TESTS=OFF \
                   -DLIBCXXABI_ENABLE_SHARED=ON \
                   -DLIBCXXABI_USE_COMPILER_RT=ON \
@@ -45,7 +50,7 @@ EXTRA_OECMAKE += "\
                   -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
                   -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \
                   -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
-                  -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi' \
+                  -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi;libunwind' \
                   -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
                   -G Ninja \
                   ${S}/llvm \
@@ -60,11 +65,17 @@ EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
 CXXFLAGS_append_armv5 = " -mfpu=vfp2"
 
 do_compile() {
+    if [ -n "${@bb.utils.filter('PACKAGECONFIG', 'unwind', d)}" ]; then
+        ninja -v ${PARALLEL_MAKE} unwind
+    fi
     ninja -v ${PARALLEL_MAKE} cxxabi
     ninja -v ${PARALLEL_MAKE} cxx
 }
 
 do_install() {
+    #DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind
+    #install -d ${D}${includedir}
+    #install -m 644 ${S}/libunwind/include/*.h ${D}${includedir}
     DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx install-cxxabi
 }