From 473257ac03320e7768ce494ec84bbfeb88fa328b Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Wed, 13 Apr 2022 10:44:59 +0200
Subject: [PATCH] bind: Port bind-libunwind-header to kirkstone
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
.../bind/bind/bind-libunwind-header.patch | 15 +++++++++------
.../bind/bind_9.16.26.bbappend | 0
2 files changed, 9 insertions(+), 6 deletions(-)
rename {meta-oniro-core => meta-oniro-staging}/recipes-connectivity/bind/bind/bind-libunwind-header.patch (70%)
rename {meta-oniro-core => meta-oniro-staging}/recipes-connectivity/bind/bind_9.16.26.bbappend (100%)
diff --git a/meta-oniro-core/recipes-connectivity/bind/bind/bind-libunwind-header.patch b/meta-oniro-staging/recipes-connectivity/bind/bind/bind-libunwind-header.patch
similarity index 70%
rename from meta-oniro-core/recipes-connectivity/bind/bind/bind-libunwind-header.patch
rename to meta-oniro-staging/recipes-connectivity/bind/bind/bind-libunwind-header.patch
index 1f0401e0..7eae3ff2 100644
--- a/meta-oniro-core/recipes-connectivity/bind/bind/bind-libunwind-header.patch
+++ b/meta-oniro-staging/recipes-connectivity/bind/bind/bind-libunwind-header.patch
@@ -17,15 +17,18 @@ expanding the macro.
Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
Upstream-Status: Pending
-diff -up bind-9.11.32/lib/isc/backtrace.c.omv~ bind-9.11.32/lib/isc/backtrace.c
---- bind-9.11.32/lib/isc/backtrace.c.omv~ 2021-06-29 21:39:37.700104599 +0200
-+++ bind-9.11.32/lib/isc/backtrace.c 2021-06-29 21:39:59.488413798 +0200
-@@ -81,8 +81,7 @@ isc_backtrace_gettrace(void **addrs, int
+diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c
+index 69488de..8da2c61 100644
+--- a/lib/isc/backtrace.c
++++ b/lib/isc/backtrace.c
+@@ -82,10 +82,7 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) {
return (ISC_R_SUCCESS);
}
#elif defined(BACKTRACE_GCC)
--extern int _Unwind_Backtrace(void* fn, void* a);
--extern void* _Unwind_GetIP(void* ctx);
+-extern int
+-_Unwind_Backtrace(void *fn, void *a);
+-extern void *
+-_Unwind_GetIP(void *ctx);
+#include <unwind.h>
typedef struct {
diff --git a/meta-oniro-core/recipes-connectivity/bind/bind_9.16.26.bbappend b/meta-oniro-staging/recipes-connectivity/bind/bind_9.16.26.bbappend
similarity index 100%
rename from meta-oniro-core/recipes-connectivity/bind/bind_9.16.26.bbappend
rename to meta-oniro-staging/recipes-connectivity/bind/bind_9.16.26.bbappend
--
GitLab