diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 15:40:56 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 15:40:56 +0000 |
| commit | 4a3a35f81c9868516fd642be30fcd316ca69e20c (patch) | |
| tree | f62edddd56aca6f945e388fdbbbc92a0ef1743f5 /meta/classes/autotools.bbclass | |
| parent | 74e5d027b92d8e4df2ee85dc7f9c1e4a7523c845 (diff) | |
| download | openembedded-core-4a3a35f81c9868516fd642be30fcd316ca69e20c.tar.gz openembedded-core-4a3a35f81c9868516fd642be30fcd316ca69e20c.tar.bz2 openembedded-core-4a3a35f81c9868516fd642be30fcd316ca69e20c.tar.xz openembedded-core-4a3a35f81c9868516fd642be30fcd316ca69e20c.zip | |
autotools.bbclass: Handle /lib as well as /usr/lib in autotools_stage_all
Diffstat (limited to 'meta/classes/autotools.bbclass')
| -rw-r--r-- | meta/classes/autotools.bbclass | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 83ab06337..365258f65 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -175,6 +175,26 @@ autotools_stage_dir() { fi } +autotools_stage_libdir() { + from="$1" + to="$2" + + olddir=`pwd` + cd $from + las=$(find . -name \*.la -type f) + cd $olddir + echo "Found la files: $las" + 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 $from/$i + done + autotools_stage_dir $from $to +} + + autotools_stage_all() { if [ "${INHIBIT_AUTO_STAGE}" = "1" ] then @@ -193,19 +213,11 @@ autotools_stage_all() { fi if [ -d ${STAGE_TEMP}/${libdir} ] then - olddir=`pwd` - cd ${STAGE_TEMP}/${libdir} - las=$(find . -name \*.la -type f) - cd $olddir - echo "Found la files: $las" - 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} + autotools_stage_libdir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR} + fi + if [ -d ${STAGE_TEMP}/${base_libdir} ] + then + autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${layout_base_libdir} fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true |