* Install the symlinks instead of copied of tools.
* Dont build shared libopcodes
* We dont need to install libbfd a separate recipe should do that if
  needed.

Signed-off-by: Khem Raj <[email protected]>
---
 recipes/binutils/binutils-cross.inc |   15 +++++++++++----
 recipes/binutils/binutils.inc       |    3 ---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/recipes/binutils/binutils-cross.inc 
b/recipes/binutils/binutils-cross.inc
index f3ba5c3..073cdad 100644
--- a/recipes/binutils/binutils-cross.inc
+++ b/recipes/binutils/binutils-cross.inc
@@ -5,15 +5,15 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 PACKAGES = ""
 EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
                --program-prefix=${TARGET_PREFIX} \
-               --enable-install-libbfd \
-               --enable-shared \
+               --disable-install-libbfd \
+               --disable-shared \
                --disable-werror \
               "
 
 do_install () {
        oe_runmake 'DESTDIR=${D}' install
-       install -m 0644 libiberty/pic/libiberty.a \
-       ${D}${libdir}/libiberty_pic.a
+       rm -rf ${D}${STAGING_DIR_NATIVE}${libdir_native}/libiberty.a
+       rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}
 
        # We don't really need these, so we'll remove them...
        rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts
@@ -26,4 +26,11 @@ do_install () {
        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir} || :
        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || :
        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || :
+       # Insert symlinks into libexec so when tools without a prefix are 
searched for, the correct ones are
+       # found.
+       dest=${D}${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/
+       install -d $dest
+       for t in ar as ld nm objcopy objdump ranlib strip; do
+               ln -sf ../../bin/${TARGET_PREFIX}$t $dest$t
+       done
 }
diff --git a/recipes/binutils/binutils.inc b/recipes/binutils/binutils.inc
index 75ee66a..c09b50a 100644
--- a/recipes/binutils/binutils.inc
+++ b/recipes/binutils/binutils.inc
@@ -43,9 +43,6 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
                --enable-shared"
 
-# This is necessary due to a bug in the binutils Makefiles
-EXTRA_OEMAKE = "configure-build-libiberty all"
-
 export AR = "${HOST_PREFIX}ar"
 export AS = "${HOST_PREFIX}as"
 export LD = "${HOST_PREFIX}ld"
-- 
1.7.1


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Reply via email to