Patchwork [v2,2/4] eglibc: unbash ldd (from oe.dev)

login
register
mail settings
Submitter Saul Wold
Date July 8, 2011, 5:29 p.m.
Message ID <d80b64403133501ff6d3a61a33ae08838499b508.1310145969.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/7263/
State New, archived
Headers show

Comments

Saul Wold - July 8, 2011, 5:29 p.m.
(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 |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 74afb9d..1b2e630 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -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
 }