summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-12 13:09:17 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-12 13:09:17 +0000
commitb6fefce736d61a59ec7995fe1f47f375cf8facbf (patch)
tree591e2070058f03b9a7eaf7c638b61361c6f0a007 /meta/classes
parent9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1 (diff)
downloadpoky-b6fefce736d61a59ec7995fe1f47f375cf8facbf.tar.gz
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
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/autotools.bbclass23
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() {
198 las=$(find . -name \*.la -type f) 198 las=$(find . -name \*.la -type f)
199 cd $olddir 199 cd $olddir
200 echo "Found la files: $las" 200 echo "Found la files: $las"
201 if [ -n "$las" ]; then 201 for i in $las
202 # If there are .la files then libtool was used in the 202 do
203 # build, so install them with magic mangling. 203 sed -e 's/^installed=yes$/installed=no/' \
204 for i in $las 204 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
205 do 205 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
206 dir=$(dirname $i) 206 -i ${STAGE_TEMP}/${libdir}/$i
207 echo "oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" 207 done
208 oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} 208 autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
209 done
210 else
211 # Otherwise libtool wasn't used, and lib/ can be copied
212 # directly.
213 echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}"
214 cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
215 fi
216 fi 209 fi
217 rm -rf ${STAGE_TEMP}/${mandir} || true 210 rm -rf ${STAGE_TEMP}/${mandir} || true
218 rm -rf ${STAGE_TEMP}/${infodir} || true 211 rm -rf ${STAGE_TEMP}/${infodir} || true