[oe] [PATCH] binutils-cross.inc: Stage libiberty.h for elf2flt linker wrapper.

[Leon Woestenberg]

For non-MMU targets, the binutils linker is wrapped by elf2flt,
which converts ELF into a flat memory space file.

The elf2flt-cross tool needs libiberty staged. This patch stages
the header file. The library seems staged into cross elsewhere,
although it is vague under old packaged-staging how exactly.

Tested-by: Walter Goossens <walter.goossens at axon.tv>
Signed-off-by: Leon Woestenberg <leon at sidebranch.com>
---
 conf/distro/angstrom-2008.1.conf        |    2 +-
 conf/distro/include/angstrom-uclibc.inc |    2 +-
 recipes/binutils/binutils-cross.inc     |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index abc9a93..51d8242 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -79,7 +79,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers 	?= "2.6.31"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.9"
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 004d904..e49d078 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -27,7 +27,7 @@ BUILD_OPTIMIZATION = "-O2 -ggdb3"
 #Note that this testing was done without the gcc-pr32889.patch.
 FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
 
-TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}"
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32', 'nios2']]}"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc
index 5808c1f..a113f7e 100644
--- a/recipes/binutils/binutils-cross.inc
+++ b/recipes/binutils/binutils-cross.inc
@@ -11,6 +11,9 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
 do_stage () {
 	oe_runmake install
 
+	install -d ${CROSS_DIR}/include
+	install -m 0644 ${S}/include/libiberty.h ${CROSS_DIR}/include
+
 	# We don't really need these, so we'll remove them...
 	rm -rf ${CROSS_DIR}/lib/ldscripts
 	rm -rf ${CROSS_DIR}/share/info
-- 
1.6.0.4