From 5aef1898a5b5e1a91fa5c2ce834b1c69c3df7900 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 26 Jul 2011 12:57:54 -0500 Subject: binutils: Fix multilib header conflict - bfd.h bfd.h conflicts between 32-bit and 64-bit versions. (From OE-Core rev: cd2975f7ad380aaac8c88bc151a2c34a42d4c540) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 4 +++- meta/recipes-devtools/binutils/binutils_2.21.1.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 9a6b9c83e8..58fee854e3 100644 --- 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 e1a16a65e2..1f361170e7 100644 --- 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\ -- cgit v1.2.3-54-g00ecf