summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:30 +0100
commit36aa1ce0ca58c7ef5fec3d69ae53b4037f15f4dc (patch)
treed1d29ef3b8ab0da42318855e16a3bc51db0ac01c
parent65ebaf076d64ddfcd4d5ef072724e2e4ad22cc37 (diff)
downloadpoky-36aa1ce0ca58c7ef5fec3d69ae53b4037f15f4dc.tar.gz
libunwind: upgrade 1.3.1 -> 1.4.0
(From OE-Core rev: 494b3c8bf73b8320fc68203d2dff5d5d3f93464e) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch27
-rw-r--r--meta/recipes-support/libunwind/libunwind_1.4.0.bb (renamed from meta/recipes-support/libunwind/libunwind_1.3.1.bb)4
2 files changed, 19 insertions, 12 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch
index 79f63fd84e..63b78a8a30 100644
--- a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch
+++ b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch
@@ -1,4 +1,7 @@
1If you: 1From 49b21f0fe5fb93b30b94cc449429fd33de0652a7 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Thu, 18 Aug 2016 14:46:32 +0100
4Subject: [PATCH] If you:
2 5
3TCLIBC=musl bitbake unwind 6TCLIBC=musl bitbake unwind
4TCLIBC=musl bitbake gcc-runtime -c cleansstate 7TCLIBC=musl bitbake gcc-runtime -c cleansstate
@@ -6,12 +9,12 @@ TCLIBC=musl bitbake gcc-runtime
6 9
7you will see libstdc++ fail to build due to finding libunwind's header file. 10you will see libstdc++ fail to build due to finding libunwind's header file.
8 11
9Khem: "When we build any of gcc components they expect to use internal version 12Khem: "When we build any of gcc components they expect to use internal version
10and that works with glibc based gcc since the search headers first look into gcc 13and that works with glibc based gcc since the search headers first look into gcc
11headers, however with musl the gcc headers are searched after the standard 14headers, however with musl the gcc headers are searched after the standard
12headers ( which is by design the right thing )." 15headers ( which is by design the right thing )."
13 16
14This patch hacks around the issue by looking for a define used during gcc-runtime's 17This patch hacks around the issue by looking for a define used during gcc-runtime's
15build and skipping to the internal header in that case. 18build and skipping to the internal header in that case.
16 19
17[YOCTO #10129] 20[YOCTO #10129]
@@ -20,11 +23,15 @@ RP 2016/8/18
20 23
21Upstream-Status: Inappropriate [really need to fix gcc] 24Upstream-Status: Inappropriate [really need to fix gcc]
22 25
23Index: git/include/unwind.h 26---
24=================================================================== 27 include/unwind.h | 4 ++++
25--- git.orig/include/unwind.h 28 1 file changed, 4 insertions(+)
26+++ git/include/unwind.h 29
27@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L 30diff --git a/include/unwind.h b/include/unwind.h
31index 7cf128d..31c2871 100644
32--- a/include/unwind.h
33+++ b/include/unwind.h
34@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
28 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 35 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
29 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 36 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
30 37
diff --git a/meta/recipes-support/libunwind/libunwind_1.3.1.bb b/meta/recipes-support/libunwind/libunwind_1.4.0.bb
index 037e04c3c0..f50205f1b9 100644
--- a/meta/recipes-support/libunwind/libunwind_1.3.1.bb
+++ b/meta/recipes-support/libunwind/libunwind_1.4.0.bb
@@ -10,8 +10,8 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV
10 " 10 "
11SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" 11SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
12 12
13SRC_URI[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6" 13SRC_URI[md5sum] = "5114504c74ac3992ac06aa551cd55678"
14SRC_URI[sha256sum] = "43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8" 14SRC_URI[sha256sum] = "df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435"
15 15
16EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static" 16EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static"
17 17