From 171ed7fe7464d1a1d4396d421dfbaf009cbc38d2 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 8 Jul 2011 09:29:55 -0700 Subject: eglibc: unbash ldd (from oe.dev) (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 (From OE-Core rev: 2fc1ef1ad69e18dcc9cff05bd65f042a8dece5bb) Signed-off-by: Thomas Zimmermann Signed-off-by: Khem Raj Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 74afb9d2b0..1b2e630172 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 } -- cgit v1.2.3-54-g00ecf