]> code.ossystems Code Review - openembedded-core.git/commitdiff
eglibc: unbash ldd (from oe.dev)
authorSaul Wold <sgw@linux.intel.com>
Fri, 8 Jul 2011 16:29:55 +0000 (09:29 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 8 Jul 2011 22:01:36 +0000 (23:01 +0100)
    (From oe-dev rev: 0a831e2cd1c27d30cd76ddada9a44a703ab60f41)

    * 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

Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-core/eglibc/eglibc.inc

index 74afb9d2b0c2549a2926d9b6fa51f852475006c8..1b2e630172ea0e973b2a7038070360af821ea0c3 100644 (file)
@@ -21,8 +21,6 @@ siteconfig_do_siteconfig_gencache_prepend = " \
 
 # 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
-#RDEPENDS_ldd += " bash"
 # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
 #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
@@ -47,5 +45,6 @@ PACKAGES = "glibc catchsegv sln nscd ldd glibc-utils glibc-dev glibc-doc libsegf
 
 OE_FEATURES = "${@features_to_eglibc_settings(d)}"
 do_configure_prepend() {
+       sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
        echo '${OE_FEATURES}' > ${B}/option-groups.config
 }