binutils: Fix multilib header conflict - bfd.h

bfd.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 9a6b9c83e8c0356e24c7d2f802c0c89a8a3d6809..58fee854e3c818ccb129e75fda2a8e961a9788ef 100644 (file)
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -13,7 +13,7 @@ LICENSE = "GPLv3"
 
 DEPENDS = "flex-native bison-native zlib-native"
 
-inherit autotools gettext
+inherit autotools gettext multilib_header
 
 PACKAGES += "${PN}-symlinks"
 
@@ -116,6 +116,8 @@ do_install () {
        done
 
        rm ${D}${bindir}/ar ${D}${bindir}/strings
+
+       oe_multilib_header bfd.h
 }
 
 do_install_virtclass-native () {

diff --git a/meta/recipes-devtools/binutils/binutils_2.21.1.bb b/meta/recipes-devtools/binutils/binutils_2.21.1.bb
index e1a16a65e2ffd6b3971395b30a024a0167975a5c..1f361170e70904be30db01a46bc914c8ecc64090 100644 (file)
--- a/meta/recipes-devtools/binutils/binutils_2.21.1.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.21.1.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM="\
     file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\