Patchwork [CONSOLIDATED,PULL,03/16] apr-util: extend sed call to fix libtool patch for case without SHELL in LIBTOOL variable

login
mail settings
Submitter Saul Wold
Date Nov. 15, 2011, 8:58 p.m.
Message ID <8f97046269eb90d5256e31f3ddd4f0246304e0d6.1321389699.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14993/
State Accepted
Commit 94b7566ac9d07ad3e1b55f12988f53812d3651cd
Headers show

Comments

Saul Wold - Nov. 15, 2011, 8:58 p.m.
From: Martin Jansa <Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-support/apr/apr-util_1.3.12.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/recipes-support/apr/apr-util_1.3.12.bb b/meta/recipes-support/apr/apr-util_1.3.12.bb
index 0064c51..62d72cf 100644
--- a/meta/recipes-support/apr/apr-util_1.3.12.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.12.bb
@@ -40,6 +40,8 @@  do_configure_prepend_virtclass-native() {
 }
 do_configure_append_virtclass-native() {
 	sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
+	# sometimes there isn't SHELL
+	sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
 }
 
 FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"