summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-04-11 18:31:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-23 11:43:26 +0100
commit261b9e249b1780d6598a8fba2189724e5ebec096 (patch)
treecd7316aaf4d339e4c9cdcb8404500f9627999cd7
parentcf8446ce84ffd17f392a9e88c3061052fcbe4cd0 (diff)
downloadpoky-261b9e249b1780d6598a8fba2189724e5ebec096.tar.gz
apr: remove the use of ${SHELL} to avoid bash/dash confliction
While multible hosts sharing a common sstate cache, the fist host using bash as default shell and build apr, the second host using dash as default shell and build apr-util, there was a failure in apr-util: ... | /bin/sh: 0: Can't open i586-poky-linux-libtool | make[1]: *** [dbm/apr_dbm_gdbm.lo] Error 127 | make[1]: *** Waiting for unfinished jobs.... | make[1]: Leaving directory `tmp/work/i586-poky-linux/apr-util/1.5.2-r0/apr-util-1.5.2' ... The quick way to reproduce the defect in Ubuntu 1204: 1. Create a new build 2. sudo dpkg-reconfigure dash <set bash as /bin/sh> 3. bitbake apr 4. sudo dpkg-reconfigure dash <set dash as /bin/sh> 5. bitbake apr-util Remove the use of $(SHELL) in the apr could avoid this issue. (From OE-Core rev: 53af71200b6f6d117e1e7dc2e7a7d21c6faab8f9) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/apr/apr_1.4.8.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.4.8.bb
index 4d36585a3e..7a130d1bdc 100644
--- a/meta/recipes-support/apr/apr_1.4.8.bb
+++ b/meta/recipes-support/apr/apr_1.4.8.bb
@@ -56,7 +56,7 @@ apr_sysroot_preprocess () {
56 cp ${S}/build/apr_rules.mk $d/ 56 cp ${S}/build/apr_rules.mk $d/
57 sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk 57 sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk
58 sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk 58 sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk
59 sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g $d/apr_rules.mk 59 sed -i s,LIBTOOL=.*,LIBTOOL=${HOST_SYS}-libtool,g $d/apr_rules.mk
60 sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk 60 sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk
61 cp ${S}/build/mkdir.sh $d/ 61 cp ${S}/build/mkdir.sh $d/
62 cp ${S}/build/make_exports.awk $d/ 62 cp ${S}/build/make_exports.awk $d/