From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 7 Mar 2008 17:53:20 +0000 (+0000)
Subject: cross-linkage: Make it less destructive and safer
X-Git-Tag: Release-2010-05/1~7543
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7ad934bcea57e824c9065bb4e0d068a036c2cd2;p=openembedded.git

cross-linkage: Make it less destructive and safer
---

diff --git a/packages/meta/cross-linkage_1.0.bb b/packages/meta/cross-linkage_1.0.bb
index 2a9caca5da..e840e607b0 100644
--- a/packages/meta/cross-linkage_1.0.bb
+++ b/packages/meta/cross-linkage_1.0.bb
@@ -21,8 +21,14 @@ do_install() {
 
 do_stage () {
 	install -d ${CROSS_DIR}/${TARGET_SYS}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include
+	if [ -e ${CROSS_DIR}/${TARGET_SYS}/include ]; then
+		cp -pPRr ${CROSS_DIR}/${TARGET_SYS}/include/* ${STAGING_INCDIR}
+		mv ${CROSS_DIR}/${TARGET_SYS}/include/ ${CROSS_DIR}/${TARGET_SYS}/include-oldbackup
+	fi
 	ln -s  ${STAGING_INCDIR}/ ${CROSS_DIR}/${TARGET_SYS}/include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/lib
+	if [ -e ${CROSS_DIR}/${TARGET_SYS}/lib ]; then
+		cp -pPRr ${CROSS_DIR}/${TARGET_SYS}/lib/* ${STAGING_LIBDIR}
+		mv ${CROSS_DIR}/${TARGET_SYS}/lib/ ${CROSS_DIR}/${TARGET_SYS}/lib-oldbackup
+	fi
 	ln -s  ${STAGING_LIBDIR} ${CROSS_DIR}/${TARGET_SYS}/lib 
 }