diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-07-08 09:29:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-08 23:02:07 +0100 |
commit | 171ed7fe7464d1a1d4396d421dfbaf009cbc38d2 (patch) | |
tree | 494c724181eca0aa936ba93c7c0ac11d3052d7cd /meta/recipes-core/eglibc | |
parent | 7061af381277a20e4df455daac9754b73fcbe467 (diff) | |
download | poky-171ed7fe7464d1a1d4396d421dfbaf009cbc38d2.tar.gz |
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 <ml@vdm-design.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 3 |
1 files changed, 1 insertions, 2 deletions
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 = " \ | |||
21 | 21 | ||
22 | # nptl needs unwind support in gcc, which can't be built without glibc. | 22 | # nptl needs unwind support in gcc, which can't be built without glibc. |
23 | DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" | 23 | DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" |
24 | #this leads to circular deps, so lets not add it yet | ||
25 | #RDEPENDS_ldd += " bash" | ||
26 | # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this | 24 | # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this |
27 | #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" | 25 | #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" |
28 | PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" | 26 | 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 | |||
47 | 45 | ||
48 | OE_FEATURES = "${@features_to_eglibc_settings(d)}" | 46 | OE_FEATURES = "${@features_to_eglibc_settings(d)}" |
49 | do_configure_prepend() { | 47 | do_configure_prepend() { |
48 | sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in | ||
50 | echo '${OE_FEATURES}' > ${B}/option-groups.config | 49 | echo '${OE_FEATURES}' > ${B}/option-groups.config |
51 | } | 50 | } |