From 84c2bb3f0570c45887f3b04136c86ad78e29c697 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 2 May 2010 00:24:12 +0100 Subject: cross/staging.bbclass: Make sure .la files get mangled and add extra mangling for problematic cross paths Signed-off-by: Richard Purdie --- classes/cross.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'classes/cross.bbclass') diff --git a/classes/cross.bbclass b/classes/cross.bbclass index f95144cfcb..70178b2a77 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -67,6 +67,11 @@ sysroot_stage_all() { sysroot_stage_dir ${D} ${SYSROOT_DESTDIR} install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ - mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true - mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true + sysroot_stage_libdir ${SYSROOT_DESTDIR}${target_base_libdir} ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir} + sysroot_stage_libdir ${SYSROOT_DESTDIR}${target_libdir} ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir} } + +# +# Cross .la files have more path issues we have to correct +SYSROOTEXTRALIBDIRSED = '-e "/^libdir=/s,.*,libdir=${STAGING_DIR_TARGET}${target_libdir},g"' + -- cgit v1.2.3