summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-08-10 08:05:52 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-13 13:36:02 +0100
commit44d7c5678f52593d55c23f16d0da6c188734b026 (patch)
tree7812836175a21eacdab8ce76f5fc5c84466bac2c
parent46771a85b0cd8edeab2b2bb2b79754fb797f24b2 (diff)
downloadopenembedded-core-44d7c5678f52593d55c23f16d0da6c188734b026.tar.gz
openembedded-core-44d7c5678f52593d55c23f16d0da6c188734b026.tar.bz2
openembedded-core-44d7c5678f52593d55c23f16d0da6c188734b026.zip
staging.bbclass: mangle *.la for ${base_libdir} too
currently staging.bbclass mangle *.la to ensure sysroot prefix attached to dependency_libs if other *.la is referenced, however it only happens on ${libdir}. libpam is special with its libraries under ${base_libdir}. So this extends mangle to ${base_libdir} too Signed-off-by: Kevin Tian <kevin.tian@intel.com>
-rw-r--r--meta/classes/staging.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 4f398652be..e66dc044af 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -35,6 +35,7 @@ sysroot_stage_libdir() {
sed -e 's/^installed=yes$/installed=no/' \
-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
done
sysroot_stage_dir $src $dest