From 2dad46604dee1e6e8a6384650cf37d190c03054f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 5 May 2008 22:46:30 +0000 Subject: meta-toolchain: Don't remove .la files, try and fix them git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4429 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/meta/meta-toolchain.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index 9deda4c1c..722a4e9fc 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb @@ -75,9 +75,14 @@ do_populate_sdk() { done done - # Remove broken .la files - rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_base_libdir}/*.la - rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_libdir}/*.la + # Fix or remove broken .la files + for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do + sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ + -e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1${prefix}/${TARGET_SYS}${layout_libdir},g" \ + -e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ + -e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1${prefix}/${TARGET_SYS}${layout_libdir},g" \ + -e 's/^installed=yes$/installed=no/' $i + done rm -f ${SDK_OUTPUT}/${prefix}/lib/*.la # Setup site file for external use -- cgit v1.2.3