[oe] [PATCH] autotools.bbclass: Add new pattern to match -L<libdir> in dependency_libs

Khem Raj raj.khem at gmail.com
Wed Mar 11 20:56:19 UTC 2009


	* Current pattern match does one think wrong consider
	something like this
	dependency_libs=' -L/home/kraj/work/oe/build/eglibc/omap5912osk/work/x86_64-linux/ncurses-native-5.4-r17/ncurses-5.4/lib'
	this pattern when matched gets converted to
	dependency_libs=' -L/home/kraj/work/oe/build/eglibc/omap5912osk/staging/x86_64-linux/usr/lib/lib'
	which is wrong. If we had a '/' appended to original path then it would work.
	This patch lets it straight.
---
 classes/autotools.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index fd8687e..20f371a 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -212,7 +212,8 @@ autotools_stage_all() {
 		for i in $las
 		do
 			sed -e 's/^installed=yes$/installed=no/' \
-			    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+			    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*.la\),${STAGING_LIBDIR}/\1,g' \
+			    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR},g' \
 			    -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
 			    -i ${STAGE_TEMP}/${libdir}/$i
 		done
-- 
1.6.0.4





More information about the Openembedded-devel mailing list