diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2009-03-10 11:00:09 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-03-10 11:00:09 -0700 |
| commit | 31abc4f83484990470e1fedfecd9d3a2ea9cf3dc (patch) | |
| tree | 4ac4d406ab7ca99a09b4ee85cb3197e5fa6fd66e /classes | |
| parent | 15595fa2e1222509a57ae6c2e55ef9d8b8829989 (diff) | |
| download | openembedded-31abc4f83484990470e1fedfecd9d3a2ea9cf3dc.tar.gz | |
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.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index fd8687ebb6..20f371a987 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 |