diff options
Diffstat (limited to 'meta/classes/utils.bbclass')
| -rw-r--r-- | meta/classes/utils.bbclass | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 746f46ce52..4d4b9953e2 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass | |||
| @@ -199,19 +199,8 @@ oe_libinstall() { | |||
| 199 | __runcmd install -m 0644 $dota $destpath/ | 199 | __runcmd install -m 0644 $dota $destpath/ |
| 200 | fi | 200 | fi |
| 201 | if [ -f "$dotlai" -a -n "$libtool" ]; then | 201 | if [ -f "$dotlai" -a -n "$libtool" ]; then |
| 202 | if test -n "$staging_install" | 202 | rm -f $destpath/$libname.la |
| 203 | then | 203 | __runcmd install -m 0644 $dotlai $destpath/$libname.la |
| 204 | # stop libtool using the final directory name for libraries | ||
| 205 | # in staging: | ||
| 206 | __runcmd rm -f $destpath/$libname.la | ||
| 207 | __runcmd sed -e 's/^installed=yes$/installed=no/' \ | ||
| 208 | -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ | ||
| 209 | -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ | ||
| 210 | $dotlai >$destpath/$libname.la | ||
| 211 | else | ||
| 212 | rm -f $destpath/$libname.la | ||
| 213 | __runcmd install -m 0644 $dotlai $destpath/$libname.la | ||
| 214 | fi | ||
| 215 | fi | 204 | fi |
| 216 | 205 | ||
| 217 | for name in $library_names; do | 206 | for name in $library_names; do |