[oe-commits] Martin Jansa : apr-util: extend sed call to fix libtool patch for case without SHELL in LIBTOOL variable

git at git.openembedded.org git at git.openembedded.org
Thu Nov 17 10:48:28 UTC 2011


Module: openembedded-core.git
Branch: master-next
Commit: 94b7566ac9d07ad3e1b55f12988f53812d3651cd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=94b7566ac9d07ad3e1b55f12988f53812d3651cd

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Nov 15 12:58:35 2011 -0800

apr-util: extend sed call to fix libtool patch for case without SHELL in LIBTOOL variable

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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"





More information about the Openembedded-commits mailing list