From 142241ab389838cc449fdac26a21b2c8a06fb4b4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 28 May 2021 17:37:52 -0700
Subject: libunwind: Install headers and pkgconfig file

This ensures it can replace nongnu libunwind
Use it only when selecting RUNTIME = "llvm"

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit c48de926ac54802df7e1e4b7f91caa4fa4ef45b1)
---
 recipes-devtools/clang/clang/libunwind.pc.in |  9 +++++++++
 recipes-devtools/clang/common.inc            |  1 +
 recipes-devtools/clang/libcxx_git.bb         | 11 +++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 recipes-devtools/clang/clang/libunwind.pc.in

diff --git a/recipes-devtools/clang/clang/libunwind.pc.in b/recipes-devtools/clang/clang/libunwind.pc.in
new file mode 100644
index 0000000..a93d676
--- /dev/null
+++ b/recipes-devtools/clang/clang/libunwind.pc.in
@@ -0,0 +1,9 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=@LIBDIR@
+includedir=/usr/include
+
+Name: libunwind
+Description: libunwind base library
+Version: @VERSION@
+Libs: -lunwind
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 8046c35..d68d6f5 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -9,6 +9,7 @@ BASEURI ??= "${LLVM_GIT}/llvm-project;protocol=${LLVM_GIT_PROTOCOL};branch=${BRA
 SRC_URI = "\
     ${BASEURI} \
     file://llvm-config \
+    file://libunwind.pc.in \
     file://0001-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \
     file://0002-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch \
     file://0003-compiler-rt-support-a-new-embedded-linux-target.patch \
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index c179006..ef330dd 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -77,5 +77,16 @@ ALLOW_EMPTY_${PN} = "1"
 
 PROVIDES += "${@bb.utils.contains("RUNTIME", "llvm", "libunwind", "", d)}"
 
+
+do_install_append() {
+    if ${@bb.utils.contains("RUNTIME", "llvm", "true", "false", d)}
+    then
+        install -Dm 0644 ${S}/libunwind/include/libunwind.h ${S}/libunwind/include/__libunwind_config.h ${D}${includedir}
+        install -Dm 0644 ${S}/libunwind/include/unwind.h ${D}${includedir}/unwind.h
+        install -d ${D}${libdir}/pkgconfig
+        sed -e 's,@LIBDIR@,${libdir},g;s,@VERSION@,${PV},g' ${S}/../libunwind.pc.in > ${D}${libdir}/pkgconfig/libunwind.pc
+    fi
+}
+
 BBCLASSEXTEND = "native nativesdk"
 TOOLCHAIN = "clang"
-- 
cgit v1.2.3-54-g00ecf