summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-13 23:39:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 10:59:33 (GMT)
commit94e3e894d0f535f010ae332ca7f68f86b0475516 (patch)
tree409d3fe95586da2b08a83438cadabdad62d88810 /meta
parent8389decfe6122938382ce5090c36d205c9427dac (diff)
downloadpoky-94e3e894d0f535f010ae332ca7f68f86b0475516.tar.gz
eglibc: added ac_cv_path_ to CACHED_CONFIGUREVARS
On Fedora 17, bash has moved to /usr/bin/bash and the configure process finds it on the host machine there, this ensures that it is set correctly for the target. [YOCTO #2363] (From OE-Core rev: 0d957dd0604230bef1d01ee9992c56d2aca62ec1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Reworked commit to fix merge conflicts with denzil branch. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb2
3 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 8e3fe50..51061bc 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -32,6 +32,8 @@ require eglibc-options.inc
32 32
33LEAD_SONAME = "libc.so" 33LEAD_SONAME = "libc.so"
34 34
35CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
36 ac_cv_path_BASH_SHELL=${base_bindir}/bash"
35GLIBC_EXTRA_OECONF ?= "" 37GLIBC_EXTRA_OECONF ?= ""
36GLIBC_EXTRA_OECONF_virtclass-nativesdk = "" 38GLIBC_EXTRA_OECONF_virtclass-nativesdk = ""
37INHIBIT_DEFAULT_DEPS = "1" 39INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 73cd0aa..690f99d 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "15508" 3SRCREV = "15508"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r27" 6PR = "r28"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_BRANCH="eglibc-2_13"
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 713efc3..f5219d1 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "17386" 3SRCREV = "17386"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r6" 6PR = "r7"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_15" 9EGLIBC_BRANCH="eglibc-2_15"