summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-10-10 08:55:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-10 18:29:52 +0100
commitcfbf6fad48f251d7eb76c7f99ac3f74cfbbcee07 (patch)
tree332d2d23c2967663c4686917b9529519c51f2f37 /meta
parent650d20107d3e0faeb336c2648f97f2041cb58549 (diff)
downloadpoky-cfbf6fad48f251d7eb76c7f99ac3f74cfbbcee07.tar.gz
eglibc: force make to use /bin/bash
The eglibc core build still has a number of issues with /bin/dash. Recently found is both sysdeps/unix/make-syscalls.sh and it's output, which make calls via SHELL do not play well with /bin/dash. By force make to use /bin/bash via SHELL setting it works correctly. Currenly known issues are: make-syscalls.sh line with a bad substitution, which can be corrected by: vdso_symver="$(printf '%s\n' ${vdso_symver} | sed 's/\./_/')" Following that there is an issue with emiting a '\n' through a second echo and then to the compiler. There maybe more issues beyond that. [YOCTO #3080] (From OE-Core rev: 9d002f7cdc5309c4d850a76e4fd73ff04c980a07) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc5
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb2
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index cae955d523..e1ec6b2b8c 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -51,6 +51,11 @@ EXTRA_OEMAKE[vardepsexclude] += "EGLIBCPARALLELISM"
51EXTRA_OEMAKE += "${EGLIBCPARALLELISM}" 51EXTRA_OEMAKE += "${EGLIBCPARALLELISM}"
52PARALLEL_MAKE = "" 52PARALLEL_MAKE = ""
53 53
54# eglibc make-syscalls.sh has a number of issues with /bin/dash and
55# it's output which make calls via the SHELL also has issues, so
56# ensure make uses /bin/bash
57EXTRA_OEMAKE += "SHELL=/bin/bash"
58
54OE_FEATURES = "${@features_to_eglibc_settings(d)}" 59OE_FEATURES = "${@features_to_eglibc_settings(d)}"
55do_configure_prepend() { 60do_configure_prepend() {
56 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in 61 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 32b03645e5..78bf9bedaf 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "20393" 3SRCREV = "20393"
4 4
5DEPENDS += "gperf-native kconfig-frontends-native" 5DEPENDS += "gperf-native kconfig-frontends-native"
6PR = "r14" 6PR = "r15"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_16" 9EGLIBC_BRANCH="eglibc-2_16"