meta-toolchain: Fix symlinks after moving files around (gross hack)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1941 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 15 insertions, 0 deletions

diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 7cf657f5c6..c54ad91742 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -8,7 +8,10 @@ PROVIDES = "\
     virtual/libintl \
     virtual/libiconv \
     glibc-thread-db \
+
     virtual/linux-libc-headers "
+
+RPROVIDES = "glibc-gconv-iso8859-1"
 PR = "r1"
 
 inherit sdk
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index bf922cd31b..72513dff6a 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -64,6 +64,18 @@ EOF
         cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
         rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
 
+        for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do
+                if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then
+                        link=`readlink ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn`
+                        bname=`basename $link`
+                        if [ ! -e $link -a -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$bame ]; then
+                                rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn
+                                ln -s $bname ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn
+                        fi
+
+                fi
+        done
+
         mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib
 
         cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/