From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 15 Oct 2010 06:42:48 +0000 (-0700)
Subject: gcc-package-cross.inc: Edit the libdir enties in libstdc++.la and libsupc++.la
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b10441991fe94b832ade5ffd3f38fa197a97a076;p=openembedded.git

gcc-package-cross.inc: Edit the libdir enties in libstdc++.la and libsupc++.la

We manually move libstdc++ to staging sysroot from default install
location where gcc-cross installed it. During this process we have
to make sure that .la files are edited to contain proper libdir
entry pointing relative to sysroot.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc
index 59e7ddecb7..045c790406 100644
--- a/recipes/gcc/gcc-package-cross.inc
+++ b/recipes/gcc/gcc-package-cross.inc
@@ -28,6 +28,13 @@ do_install () {
 			mv -f ${D}${prefix}/$d/* ${D}${target_libdir} || true
 		fi
 	done
+	# since we are moving the .la files to target sysroot we need to make sure that
+	# libdir points to right place within the target sysroot
+	for la in ${D}${target_libdir}/libstdc++.la ${D}${target_libdir}/libsupc++.la; do
+		if [ -f $la ]; then
+			sed -i -e "s:^libdir=.*:libdir='${target_libdir}':g;" $la
+		fi
+	done
 
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.