summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch
blob: 49985b5b3c7f972f6f172d56a4e1143bee290928 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
From e1de5a5b42062dc02769f320c7785928b2ee0c57 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 18 Aug 2016 14:46:32 +0100
Subject: [PATCH] If you:

TCLIBC=musl bitbake unwind
TCLIBC=musl bitbake gcc-runtime -c cleansstate
TCLIBC=musl bitbake gcc-runtime

you will see libstdc++ fail to build due to finding libunwind's header file.

Khem: "When we build any of gcc components they expect to use internal version
and that works with glibc based gcc since the search headers first look into gcc
headers, however with musl the gcc headers are searched after the standard
headers ( which is by design the right thing )."

This patch hacks around the issue by looking for a define used during gcc-runtime's
build and skipping to the internal header in that case.

[YOCTO #10129]

RP 2016/8/18

Upstream-Status: Inappropriate [really need to fix gcc]

---
 include/unwind.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/unwind.h b/include/unwind.h
index 93780fa..c812414 100644
--- a/include/unwind.h
+++ b/include/unwind.h
@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
+#ifdef _GLIBCXX_SHARED
+#include_next <unwind.h>
+#endif
+
 #ifndef _UNWIND_H
 #define _UNWIND_H