Signed-off-by: Khem Raj <[email protected]>
---
classes/cross.bbclass | 7 -------
classes/staging.bbclass | 15 ---------------
classes/utils.bbclass | 13 +------------
3 files changed, 1 insertions(+), 34 deletions(-)
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index d3b27e6..e802cfe 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -72,10 +72,3 @@ sysroot_stage_all() {
sysroot_stage_libdir ${SYSROOT_DESTDIR}${target_libdir}
${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}
fi
}
-
-#
-# Cross .la files have more path issues we have to correct
-SYSROOTEXTRALIBDIRSED = '-e
"/^libdir=/s,.*,libdir=${STAGING_DIR_TARGET}${target_libdir},g" \
- -e
"/^dependency_libs=/s,\([[:space:]']\)-L${STAGING_LIBDIR_NATIVE},,g" \
-'
-
diff --git a/classes/staging.bbclass b/classes/staging.bbclass
index 303f74c..14bb1f8 100644
--- a/classes/staging.bbclass
+++ b/classes/staging.bbclass
@@ -38,24 +38,9 @@ sysroot_stage_dir() {
fi
}
-SYSROOTEXTRALIBDIRSED ?= ""
sysroot_stage_libdir() {
src="$1"
dest="$2"
-
- olddir=`pwd`
- cd $src
- las=$(find . -name \*.la -type f)
- cd $olddir
- echo "Found la files: $las"
- for i in $las
- do
- 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" \
- ${SYSROOTEXTRALIBDIRSED} \
- -i $src/$i
- done
sysroot_stage_dir $src $dest
}
diff --git a/classes/utils.bbclass b/classes/utils.bbclass
index 61f3731..9050d30 100644
--- a/classes/utils.bbclass
+++ b/classes/utils.bbclass
@@ -369,18 +369,7 @@ oe_libinstall() {
__runcmd install -m 0644 $dota $destpath/
fi
if [ -f "$dotlai" -a -n "$libtool" ]; then
- if test -n "$staging_install"
- then
- # stop libtool using the final directory name for
libraries
- # in staging:
- __runcmd rm -f $destpath/$libname.la
- __runcmd 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" \
- $dotlai >$destpath/$libname.la
- else
- __runcmd install -m 0644 $dotlai $destpath/$libname.la
- fi
+ __runcmd install -m 0644 $dotlai $destpath/$libname.la
fi
for name in $library_names; do
--
1.7.1
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
