summaryrefslogtreecommitdiffstats
path: root/classes/cross.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-05-02 00:24:12 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-05-05 15:05:55 +0100
commit84c2bb3f0570c45887f3b04136c86ad78e29c697 (patch)
tree87cb81d903b5868b9b3e2631374b7f6e95369295 /classes/cross.bbclass
parent1b9f9a1625d0fc373462474de220a9786244e8c1 (diff)
downloadopenembedded-84c2bb3f0570c45887f3b04136c86ad78e29c697.tar.gz
cross/staging.bbclass: Make sure .la files get mangled and add extra mangling for problematic cross paths
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'classes/cross.bbclass')
-rw-r--r--classes/cross.bbclass9
1 files changed, 7 insertions, 2 deletions
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"'
+