diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-10-10 08:55:45 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-10 18:28:57 +0100 |
commit | 33aaa20229de74a53a28a910712a0a7ed826ba0a (patch) | |
tree | e5da7da023abf32d97e63ae030087f47e406f663 /meta/recipes-core | |
parent | c2543b7ff5ee0c41eb06f62a861ede11c1bfa0aa (diff) | |
download | poky-33aaa20229de74a53a28a910712a0a7ed826ba0a.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/recipes-core')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 5 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.16.bb | 2 |
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" | |||
51 | EXTRA_OEMAKE += "${EGLIBCPARALLELISM}" | 51 | EXTRA_OEMAKE += "${EGLIBCPARALLELISM}" |
52 | PARALLEL_MAKE = "" | 52 | PARALLEL_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 | ||
57 | EXTRA_OEMAKE += "SHELL=/bin/bash" | ||
58 | |||
54 | OE_FEATURES = "${@features_to_eglibc_settings(d)}" | 59 | OE_FEATURES = "${@features_to_eglibc_settings(d)}" |
55 | do_configure_prepend() { | 60 | do_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 | |||
3 | SRCREV = "20393" | 3 | SRCREV = "20393" |
4 | 4 | ||
5 | DEPENDS += "gperf-native kconfig-frontends-native" | 5 | DEPENDS += "gperf-native kconfig-frontends-native" |
6 | PR = "r14" | 6 | PR = "r15" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_16" | 9 | EGLIBC_BRANCH="eglibc-2_16" |