[oe-commits] Khem Raj : autotools.bbclass: Add new pattern to match -L<libdir> in dependency_libs
GIT User account
git at amethyst.openembedded.net
Mon Mar 16 20:30:59 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 31abc4f83484990470e1fedfecd9d3a2ea9cf3dc
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=31abc4f83484990470e1fedfecd9d3a2ea9cf3dc
Author: Khem Raj <raj.khem at gmail.com>
Date: Tue Mar 10 11:00:09 2009 -0700
autotools.bbclass: Add new pattern to match -L<libdir> in dependency_libs
* 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
More information about the Openembedded-commits
mailing list