summaryrefslogtreecommitdiffstats
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:45:47 +0100
commit5aef1898a5b5e1a91fa5c2ce834b1c69c3df7900 (patch)
tree63121724fed94e3c6c11a61f43d3da3ef2b89e41
parenta447c3e8599095a704f2f41f80e8ce0c2c4f3f5b (diff)
downloadpoky-5aef1898a5b5e1a91fa5c2ce834b1c69c3df7900.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 9a6b9c83e8..58fee854e3 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -13,7 +13,7 @@ LICENSE = "GPLv3"
13 13
14DEPENDS = "flex-native bison-native zlib-native" 14DEPENDS = "flex-native bison-native zlib-native"
15 15
16inherit autotools gettext 16inherit autotools gettext multilib_header
17 17
18PACKAGES += "${PN}-symlinks" 18PACKAGES += "${PN}-symlinks"
19 19
@@ -116,6 +116,8 @@ do_install () {
116 done 116 done
117 117
118 rm ${D}${bindir}/ar ${D}${bindir}/strings 118 rm ${D}${bindir}/ar ${D}${bindir}/strings
119
120 oe_multilib_header bfd.h
119} 121}
120 122
121do_install_virtclass-native () { 123do_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 @@
1require binutils.inc 1require binutils.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5LIC_FILES_CHKSUM="\ 5LIC_FILES_CHKSUM="\
6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ 6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\