mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 15:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

autotools.bbclass: Switch stage_autotools_all to change la files itself and to stop using oe_libinstall

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4459 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-05-12 13:09:17 +00:00
parent 9b3ef75cd2
commit b6fefce736
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/autotools.bbclass
View File

@@ -198,21 +198,14 @@ autotools_stage_all() {
las=$(find . -name \*.la -type f) las=$(find . -name \*.la -type f)
cd $olddir cd $olddir
echo "Found la files: $las" 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 for i in $las
do do
dir=$(dirname $i) sed -e 's/^installed=yes$/installed=no/' \
echo "oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
-i ${STAGE_TEMP}/${libdir}/$i
done done
else autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
# 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
fi fi
rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${mandir} || true
rm -rf ${STAGE_TEMP}/${infodir} || true rm -rf ${STAGE_TEMP}/${infodir} || true