From: Kevin Tian Date: Tue, 10 Aug 2010 00:05:52 +0000 (+0800) Subject: staging.bbclass: mangle *.la for ${base_libdir} too X-Git-Tag: 2011-1~4919 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=44d7c5678f52593d55c23f16d0da6c188734b026;p=openembedded-core.git 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 --- 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