From 27ab7ce48eec89445196c7aa1ca9de605a959ca2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 14 Sep 2007 22:07:43 +0000
Subject: Delete the fcntl2 patch. Its committed upstream.

---
 packages/glibc/eglibc-svn/export-fcntl2.patch | 11 -----------
 packages/glibc/eglibc_svn.bb                  |  1 -
 2 files changed, 12 deletions(-)
 delete mode 100644 packages/glibc/eglibc-svn/export-fcntl2.patch

(limited to 'packages/glibc')

diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch
deleted file mode 100644
index 0bf6c57852..0000000000
--- a/packages/glibc/eglibc-svn/export-fcntl2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libc/io/Makefile.orig	2007-08-07 17:41:33.000000000 -0700
-+++ libc/io/Makefile	2007-08-07 17:42:25.000000000 -0700
-@@ -23,7 +23,7 @@ subdir	:= io
- 
- headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \
- 	   sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \
--	   poll.h sys/poll.h bits/poll.h \
-+	   poll.h sys/poll.h bits/poll.h bits/fcntl2.h \
- 	   utime.h ftw.h fts.h sys/sendfile.h
- 
- routines :=								\
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 0b69283681..1fe67d46fe 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -5,7 +5,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.6+svnr${SRCREV}"
 PR = "r1"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
-           file://export-fcntl2.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/trunk/libc"
-- 
cgit v1.2.3


From dcdf8689c0589d5f18dd5770b4c8a2e8af09696a Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 15 Sep 2007 13:12:59 +0000
Subject: 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

---
 packages/glibc/glibc-package.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'packages/glibc')

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
 }
-- 
cgit v1.2.3