mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-08 17:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

autotools.bbclass: Fix so libraries in directories are handled correctly with oe_libinstall, fixing staging QA issues. Thanks go to Ross for the basic patch.

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3618 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-01-29 17:59:33 +00:00
parent 4469013749
commit 3b79bc69b2
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
meta/classes/autotools.bbclass
View File

@@ -175,14 +175,24 @@ autotools_stage_all() {
fi
if [ -d ${STAGE_TEMP}/${libdir} ]
then
for i in ${STAGE_TEMP}/${libdir}/*.la
do
if [ ! -f "$i" ]; then
cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
break
fi
oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
done
cd ${STAGE_TEMP}/${libdir}
las=$(find . -name \*.la -type f)
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
fi
if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
install -d ${STAGING_DATADIR}/aclocal