From 4cd1118a090f69a7d050cd69da798af55e2b41b1 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Thu, 13 Jan 2011 21:54:25 +0800 Subject: staging: relocate *.la paths in destination dirs Keep the la files in source directories unchanged, and do relocation in destination directories (sysroot-destdir). Signed-off-by: Dongxiao Xu --- meta/classes/staging.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 843256545..a7f3258b4 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -25,8 +25,10 @@ sysroot_stage_libdir() { src="$1" dest="$2" + sysroot_stage_dir $src $dest + olddir=`pwd` - cd $src + cd $dest las=$(find . -name \*.la -type f) cd $olddir echo "Found la files: $las" @@ -36,9 +38,8 @@ sysroot_stage_libdir() { -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${STAGING_DIR_HOST}${base_libdir},g" \ - -i $src/$i + -i $dest/$i done - sysroot_stage_dir $src $dest } sysroot_stage_dirs() { -- cgit v1.2.3