[oe-commits] Thomas Zimmermann : eglibc: unbash ldd and add libpthread_nonshared. a to -dev

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 0a831e2cd1c27d30cd76ddada9a44a703ab60f41
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0a831e2cd1c27d30cd76ddada9a44a703ab60f41

Author: Thomas Zimmermann <ml at vdm-design.de>
Date:   Thu Feb 18 22:53:38 2010 +0000

eglibc: unbash ldd and add libpthread_nonshared.a to -dev

* replace shebang of ldd by /bin/sh, so ldd doesn't depend on bash
  anymore. Tested with busybox sh.
* added to do_configure_prepend because do_patch is only a python function
* add libpthread_nonshared.a to eglibc-dev. Now it's possible to
  compile multithreaded applications on the device.

Signed-off-by: Thomas Zimmermann <ml at vdm-design.de>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/eglibc/eglibc-package.bbclass |    6 +++++-
 recipes/eglibc/eglibc.inc             |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass
index fcaba47..3c33f93 100644
--- a/recipes/eglibc/eglibc-package.bbclass
+++ b/recipes/eglibc/eglibc-package.bbclass
@@ -48,7 +48,7 @@ FILES_ldd = "${bindir}/ldd"
 FILES_libsegfault = "${base_libdir}/libSegFault*"
 FILES_eglibc-extra-nss = "${base_libdir}/libnss*"
 FILES_sln = "/sbin/sln"
-FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/libc_nonshared.a"
+FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a"
 FILES_nscd = "${sbindir}/nscd*"
 FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
 FILES_eglibc-gconv = "${libdir}/gconv/*"
@@ -76,6 +76,10 @@ EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
 
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 
+do_configure_prepend() {
+        sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
+}
+
 do_install() {
 	oe_runmake install_root=${D} install
 	for r in ${rpcsvc}; do
diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc
index 356b838..5c06ae6 100644
--- a/recipes/eglibc/eglibc.inc
+++ b/recipes/eglibc/eglibc.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home"
 SECTION = "libs"
 PRIORITY = "required"
 LICENSE = "LGPL"
-INC_PR = "r8"
+INC_PR = "r9"
 # nptl needs unwind support in gcc, which can't be built without glibc.
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 #this leads to circular deps, so lets not add it yet