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

Saul Wold sgw at linux.intel.com
Tue Nov 15 20:58:35 UTC 2011


From: Martin Jansa <Martin.Jansa at gmail.com>

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

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"
-- 
1.7.6.4





More information about the Openembedded-core mailing list