From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Fri, 28 Feb 2020 22:54:09 +0000 (-0800)
Subject: binutils: fix multilib header difference
X-Git-Tag: 2020-04-dunfell~301
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=62cd67ac4ca39edac3c57f648669f1427b6fe7dd;p=openembedded-core.git

binutils: fix multilib header difference

bfd_stdint.h encodes the name of the compiler in the header
which is different between mutlilibs. Remvoe target prefix to
make the headers match.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 6ed40a1486..b0937e62fc 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -163,6 +163,8 @@ do_install () {
 	done
 
 	oe_multilib_header bfd.h
+        # bfd_stdint.h encodes the compiler name in the header
+        sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},,"
 }
 
 inherit update-alternatives