From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 15 Sep 2007 13:12:59 +0000 (+0000)
Subject: glibc-package.bbclass: fix do_prep_locale_tree
X-Git-Tag: Release-2010-05/1~8642
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcdf8689c0589d5f18dd5770b4c8a2e8af09696a;p=openembedded.git

glibc-package.bbclass: fix do_prep_locale_tree
* there are both libgcc_s.so and libgcc_s.so.${someversion} in
  ${CROSS_DIR}/${TARGET_SYS}/lib
---

diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 63feb46f34..ba105d02c3 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -147,8 +147,11 @@ do_prep_locale_tree() {
 		gunzip $i
 	done
 	ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
-	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
-		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then
+		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
+	fi
+	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
+		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
 	fi
 	install -m 0755 ${D}${bindir}/localedef $treedir/bin
 }