aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-07-26 12:57:54 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 15:39:16 +0100
commitcd2975f7ad380aaac8c88bc151a2c34a42d4c540 (patch)
tree6018c863fdbd4b179fc9b308b97a97c99069ff6b
parent1fe66d01b7bce70a37245d47b1abce155fae926e (diff)
downloadopenembedded-core-contrib-cd2975f7ad380aaac8c88bc151a2c34a42d4c540.tar.gz
openembedded-core-contrib-cd2975f7ad380aaac8c88bc151a2c34a42d4c540.tar.bz2
openembedded-core-contrib-cd2975f7ad380aaac8c88bc151a2c34a42d4c540.zip
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>
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc4
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.21.1.bb2
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 9a6b9c83e8c..58fee854e3c 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 e1a16a65e2f..1f361170e70 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\