diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-05-12 13:09:17 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-05-12 13:09:17 +0000 |
| commit | b6fefce736d61a59ec7995fe1f47f375cf8facbf (patch) | |
| tree | 591e2070058f03b9a7eaf7c638b61361c6f0a007 | |
| parent | 9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1 (diff) | |
| download | openembedded-core-b6fefce736d61a59ec7995fe1f47f375cf8facbf.tar.gz openembedded-core-b6fefce736d61a59ec7995fe1f47f375cf8facbf.tar.bz2 openembedded-core-b6fefce736d61a59ec7995fe1f47f375cf8facbf.zip | |
autotools.bbclass: Switch stage_autotools_all to change la files itself and to stop using oe_libinstall
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4459 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/autotools.bbclass | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 4945fe77d5..83ab063376 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -198,21 +198,14 @@ autotools_stage_all() { las=$(find . -name \*.la -type f) cd $olddir echo "Found la files: $las" - if [ -n "$las" ]; then - # If there are .la files then libtool was used in the - # build, so install them with magic mangling. - for i in $las - do - dir=$(dirname $i) - echo "oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" - oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} - done - else - # Otherwise libtool wasn't used, and lib/ can be copied - # directly. - echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}" - cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} - fi + 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,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ + -i ${STAGE_TEMP}/${libdir}/$i + done + autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR} fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true |