[oe-commits] Khem Raj : binutils-cross.inc: Dont install duplicate copies of tools create relative symlinks instead.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c52193ee037fe3d7c469256585ab70cb6c774ea8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c52193ee037fe3d7c469256585ab70cb6c774ea8

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Jul 30 12:50:09 2010 -0700

binutils-cross.inc: Dont install duplicate copies of tools create relative symlinks instead.

* Dont generate shared libraries and bfd.

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Koen Kooi <k-kooi at ti.com>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/binutils/binutils-cross.inc |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc
index f3ba5c3..ba3e6b5 100644
--- a/recipes/binutils/binutils-cross.inc
+++ b/recipes/binutils/binutils-cross.inc
@@ -5,25 +5,28 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 PACKAGES = ""
 EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
 		--program-prefix=${TARGET_PREFIX} \
-		--enable-install-libbfd \
-		--enable-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}${prefix}/${TARGET_SYS}
 	# We don't really need these, so we'll remove them...
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/info
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/locale
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/man
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/share || :
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}/gcc-lib || :
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64/gcc-lib || :
-	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} || :
+	rm -rf ${D}${prefix}/lib/ldscripts
+	rm -rf ${D}${prefix}/share/info
+	rm -rf ${D}${prefix}/share/locale
+	rm -rf ${D}${prefix}/share/man
+	rmdir ${D}${prefix}/share || :
+	rmdir ${D}${prefix}/${libdir}/gcc-lib || :
+	rmdir ${D}${prefix}/${libdir}64/gcc-lib || :
+	rmdir ${D}${prefix}/${libdir} || :
+	rmdir ${D}${prefix}/${libdir}64 || :
+	rmdir ${D}${prefix}/${prefix} || :
+	# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
+	# found.
+	dest=${D}${prefix}/${TARGET_SYS}${base_bindir_native}
+	install -d $dest
+	for t in ar as ld nm objcopy objdump ranlib strip; do
+		ln -sf ../..${base_bindir_native}/${TARGET_PREFIX}$t $dest/$t
+	done
 }